X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FNotifier.php;h=80628d7dba08d08fe5e55a3dabc84886e2a27038;hb=3842f02b021f2f32dbe6707c22af5760c3353dfa;hp=146bcce9f102716b7122f4a0d10f868ce118b970;hpb=4770903f546d8df2d6e276ede784b76afdb74bea;p=friendica.git diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 146bcce9f1..80628d7dba 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -445,7 +445,7 @@ class Notifier $condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false, 'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]; - $contacts = DBA::toArray(DBA::select('contact', ['id', 'url', 'addr', 'name', 'network', 'protocol'], $condition)); + $contacts = DBA::selectToArray('contact', ['id', 'url', 'addr', 'name', 'network', 'protocol'], $condition); $conversants = array_merge($contacts, $participants); @@ -673,7 +673,7 @@ class Notifier } while($contact = DBA::fetch($contacts_stmt)) { - Protocol::terminateFriendship($owner, $contact, true); + Contact::terminateFriendship($contact); } DBA::close($contacts_stmt); @@ -732,7 +732,7 @@ class Notifier // Update the locally stored follower list when we deliver to a forum foreach (Tag::getByURIId($target_item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]) as $tag) { $target_contact = Contact::getByURL(Strings::normaliseLink($tag['url']), null, [], $uid); - if (($target_contact['contact-type'] == Contact::TYPE_COMMUNITY) && $target_contact['manually-approve']) { + if ($target_contact && $target_contact['contact-type'] == Contact::TYPE_COMMUNITY && $target_contact['manually-approve']) { Group::updateMembersForForum($target_contact['id']); } }