Merge pull request #4931 from annando/no-ignored

Don't distribute for ignored contacts
This commit is contained in:
Hypolite Petovan 2018-04-25 12:07:00 -04:00 committed by GitHub
commit a9f1f47be2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -863,7 +863,7 @@ class Item extends BaseObject
unset($item['id']); unset($item['id']);
$condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)", $condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND NOT `readonly` AND `rel` IN (?, ?)",
$parent['owner-id'], CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; $parent['owner-id'], CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
$contacts = dba::select('contact', ['uid'], $condition); $contacts = dba::select('contact', ['uid'], $condition);
while ($contact = dba::fetch($contacts)) { while ($contact = dba::fetch($contacts)) {