mirror of
https://github.com/friendica/friendica
synced 2025-04-30 00:24:24 +02:00
Issue 11513: Non public replies on public posts should now work
This commit is contained in:
parent
60c6ab08c1
commit
df6cda8a4d
5 changed files with 27 additions and 16 deletions
|
@ -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` = ?)",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue