diff options
Diffstat (limited to 'Zotlabs/Module/Display.php')
-rw-r--r-- | Zotlabs/Module/Display.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 1aac7e328..eb97e77a0 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -245,8 +245,6 @@ class Display extends \Zotlabs\Web\Controller { $sql_extra = ((local_channel()) ? EMPTY_STR : item_permissions_sql(0, $observer_hash)); - - if($noscript_content || $load) { require_once('include/channel.php'); @@ -258,14 +256,13 @@ class Display extends \Zotlabs\Web\Controller { $r = null; if(local_channel()) { - $r = q("SELECT item.id AS item_id FROM item WHERE uid IN (%d, %d) AND mid = '%s' $item_normal LIMIT 1", + $r = q("SELECT item.id AS item_id FROM item WHERE uid = %d AND mid = '%s' $item_normal LIMIT 1", intval(local_channel()), - intval($sys_id), dbesc($target_item['parent_mid']) ); } - if($r === null) { + if(!$r) { $r = q("SELECT item.id AS item_id FROM item WHERE ((mid = '%s' AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' @@ -292,18 +289,17 @@ class Display extends \Zotlabs\Web\Controller { $r = null; if(local_channel()) { $r = q("SELECT item.parent AS item_id from item - WHERE uid IN (%d, %d) + WHERE uid = %d AND parent_mid = '%s' $item_normal_update $simple_update LIMIT 1", intval(local_channel()), - intval($sys_id), dbesc($target_item['parent_mid']) ); } - if($r === null) { + if(! $r) { $r = q("SELECT item.id as item_id from item WHERE ((parent_mid = '%s' AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' |