aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-04-28 17:47:26 -0700
committerzotlabs <mike@macgirvin.com>2019-04-28 17:47:26 -0700
commit95871fe13c3a9515d82510997a734bf7e8945bad (patch)
treee6974fb15bac5844220287c94755f203dc403829 /include
parent9536a490b3fc5fc02a6d0a79275e8df03ee8156b (diff)
parent0cecfceb14083141da389b7cc1e413ba5d5ca6d7 (diff)
downloadvolse-hubzilla-95871fe13c3a9515d82510997a734bf7e8945bad.tar.gz
volse-hubzilla-95871fe13c3a9515d82510997a734bf7e8945bad.tar.bz2
volse-hubzilla-95871fe13c3a9515d82510997a734bf7e8945bad.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index c08deb3a0..95b696034 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4278,7 +4278,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
if($arr['mid'])
$sql_options .= " and parent_mid = '" . dbesc($arr['mid']) . "' ";
- $sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE item_thread_top = 1 $sql_options $item_normal ) ";
+ $sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE $item_uids and item_thread_top = 1 $sql_options $item_normal ) ";
if($arr['since_id'])
$sql_extra .= " and item.id > " . $since_id . " ";