X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FContent%2FConversation.php;h=0bdc414c5016963999327ded5a27a8ddc48891ea;hb=f61fd93db02bc2d66e1473ca34dc1154e77217a3;hp=249190b1add67c4630aebf2aad6551cd2b5218ff;hpb=08ba9e4183718df1941889a572c8bc9ddd190232;p=friendica.git diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 249190b1ad..0bdc414c50 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -985,6 +985,8 @@ class Conversation $condition = DBA::mergeConditions($condition, ["`uid` IN (0, ?) AND (NOT `vid` IN (?, ?, ?) OR `vid` IS NULL)", $uid, Verb::getID(Activity::FOLLOW), Verb::getID(Activity::VIEW), Verb::getID(Activity::READ)]); + $condition = DBA::mergeConditions($condition, ["(`uid` != ? OR `private` != ?)", 0, ItemModel::PRIVATE]); + $condition = DBA::mergeConditions($condition, ["`visible` AND NOT `deleted` AND NOT `author-blocked` AND NOT `owner-blocked` AND ((NOT `contact-pending` AND (`contact-rel` IN (?, ?))) OR `self` OR `contact-uid` = ?)", @@ -1360,7 +1362,7 @@ class Conversation } } - /// @TODO: Stop recusrsively adding all children back to the top level (!!!) + /// @TODO: Stop recursively adding all children back to the top level (!!!) /// However, this apparently ensures responses (likes, attendance) display (?!) foreach ($parents as $parent) { if (count($parent['children'])) {