diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-03 17:17:20 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-03 17:17:20 -0700 |
| commit | 4adf2caaa687287cf82b930bb5a0c07d39c7afc0 (patch) | |
| tree | 670ce1e8c82b813ce86b6c8815e66ea6ea3a5adb /Zotlabs/Module/Display.php | |
| parent | db82d303e217c2ca599a8b740ebb62339d373124 (diff) | |
| parent | 0fac35686b28825da69c77f9a903e4e24a7036fa (diff) | |
| download | volse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.tar.gz volse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.tar.bz2 volse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Display.php')
| -rw-r--r-- | Zotlabs/Module/Display.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 66a09b983..2b2722421 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -185,6 +185,7 @@ class Display extends \Zotlabs\Web\Controller { $observer_hash = get_observer_hash(); $item_normal = item_normal(); + $item_normal_update = item_normal_update(); $sql_extra = public_permissions_sql($observer_hash); @@ -251,7 +252,7 @@ class Display extends \Zotlabs\Web\Controller { $r = q("SELECT item.parent AS item_id from item WHERE uid = %d and parent_mid = '%s' - $item_normal + $item_normal_update $simple_update limit 1", intval(local_channel()), @@ -275,7 +276,7 @@ class Display extends \Zotlabs\Web\Controller { and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) OR uid = %d ) $sql_extra ) - $item_normal + $item_normal_update $simple_update limit 1", dbesc($target_item['parent_mid']), |