From 125afb4ae56b1680f6bab969aaed17b20946449a Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 4 May 2018 21:27:20 +0000 Subject: [PATCH] Suppress blocked contacts from being displayed --- include/conversation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 0d6f852c83..ae12cf4827 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -474,8 +474,8 @@ function item_joins() { AND NOT `contact`.`blocked` 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 `owner` ON `owner`.`id`=`item`.`owner-id` + INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` AND NOT `author`.`blocked` + INNER JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id` AND NOT `owner`.`blocked` LEFT JOIN `event` ON `event-id` = `event`.`id`", CONTACT_IS_SHARING, CONTACT_IS_FRIEND );