aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-05-11 12:14:44 +0000
committerMario <mario@mariovavti.com>2021-05-11 12:14:44 +0000
commit3a2e5d480ca26916e152acac5e2bd4547c05aefd (patch)
treee5031f052b8143ad0b4df6622d4299ed38e34f22
parent26e851ff7fc074592f93088dbd96713b22defe8b (diff)
downloadvolse-hubzilla-3a2e5d480ca26916e152acac5e2bd4547c05aefd.tar.gz
volse-hubzilla-3a2e5d480ca26916e152acac5e2bd4547c05aefd.tar.bz2
volse-hubzilla-3a2e5d480ca26916e152acac5e2bd4547c05aefd.zip
update include/items.php5.6
-rw-r--r--include/items.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/include/items.php b/include/items.php
index 9e2a1c10e..29160c01d 100644
--- a/include/items.php
+++ b/include/items.php
@@ -4555,13 +4555,6 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
$item_uids = " item.uid = " . intval($uid) . " ";
}
- if (! (isset($arr['include_follow']) && intval($arr['include_follow']))) {
- $sql_options .= sprintf(" and not verb in ('%s', '%s') ",
- dbesc(ACTIVITY_FOLLOW),
- dbesc(ACTIVITY_UNFOLLOW)
- );
- }
-
if($arr['star'])
$sql_options .= " and item_starred = 1 ";
@@ -4629,7 +4622,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
}
if($channel && intval($arr['compat']) === 1) {
- $sql_extra = " AND author_xchan = '" . $channel['channel_hash'] . "' and item_private = 0 $sql_options $item_normal ";
+ $sql_extra = " AND author_xchan = '" . $channel['channel_hash'] . "' and item_private = 0 $item_normal ";
}
if ($arr['datequery']) {