jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add missing readonly check for displaying items in item_joins

Browse source
This commit is contained in:
Hypolite Petovan 2018-04-28 07:47:02 -04:00
parent bd21fc3751
commit c417f779c4
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/conversation.php
View file

@ -470,11 +470,14 @@ These Fields are not added below (yet). They are here to for bug search.
* @brief SQL join for contacts that are needed for displaying items * @brief SQL join for contacts that are needed for displaying items
*/ */
function item_joins() { function item_joins() {
return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND return sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
(NOT `contact`.`blocked` OR `contact`.`pending`) AND `contact`.`rel` IN (%s, %s)
AND NOT (`contact`.`blocked` OR `contact`.`readonly` OR `contact`.`pending`)
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`",
CONTACT_IS_SHARING, CONTACT_IS_FRIEND
);
} }
/** /**