clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4954 from annando/hide-contacts 

Fix PR 4942: Fixed item query
This commit is contained in:
Tobias Diekershoff 2018-04-29 18:40:01 +02:00 committed by GitHub
parent cc2703ce8d 78f563407a
commit 2c1b1841bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/conversation.php
View File

@ -471,8 +471,9 @@ These Fields are not added below (yet). They are here to for bug search.
*/ */
function item_joins() { function item_joins() {
return sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` return sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND (`contact`.`rel` IN (%s, %s) OR `contact`.`self`) AND NOT `contact`.`blocked`
AND NOT (`contact`.`blocked` OR `contact`.`readonly` OR `contact`.`pending`) AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
OR `contact`.`self` OR (`item`.`id` != `item`.`parent`))
LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id` LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`
LEFT JOIN `event` ON `event-id` = `event`.`id`", LEFT JOIN `event` ON `event-id` = `event`.`id`",