diff options
| author | Mario <mario@mariovavti.com> | 2021-03-14 09:01:12 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-14 10:03:03 +0100 |
| commit | 97c7b010edd30087a98ee61183934dccfdc357a2 (patch) | |
| tree | d6b4c3e4110091b38b412df8e420407d40f758f2 /include | |
| parent | b9e1c38773d761a85132e6656995431b3e5980dd (diff) | |
| download | volse-hubzilla-97c7b010edd30087a98ee61183934dccfdc357a2.tar.gz volse-hubzilla-97c7b010edd30087a98ee61183934dccfdc357a2.tar.bz2 volse-hubzilla-97c7b010edd30087a98ee61183934dccfdc357a2.zip | |
mod subthread issue continued
(cherry picked from commit b6d30f67345f37dae8dfffd96b065e6139364bcd)
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index 26d009b55..3a59aaedb 100644 --- a/include/items.php +++ b/include/items.php @@ -4510,6 +4510,13 @@ 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 "; @@ -4577,7 +4584,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 $item_normal "; + $sql_extra = " AND author_xchan = '" . $channel['channel_hash'] . "' and item_private = 0 $sql_options $item_normal "; } if ($arr['datequery']) { @@ -4682,7 +4689,6 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C ); require_once('include/items.php'); - xchan_query($items); $items = fetch_post_tags($items,true); |