tobias/friendica
1
0
Fork 0
Code Pull requests Activity

We have to check for "0" in "rel" as well

Browse source
This commit is contained in:
Michael 2019-09-09 20:39:19 +00:00
parent f185f6fd3d
commit 323285216b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/notifications.php
View file

@ -52,7 +52,7 @@ function notifications_post(App $a)
// The check for pending is in case the friendship was already approved // The check for pending is in case the friendship was already approved
// and we just want to get rid of the pending contact // and we just want to get rid of the pending contact
$condition = ['id' => $contact_id, 'uid' => local_user(), $condition = ['id' => $contact_id, 'uid' => local_user(),
'self' => false, 'pending' => true, 'rel' => Contact::FOLLOWER]; 'self' => false, 'pending' => true, 'rel' => [0, Contact::FOLLOWER]];
if (DBA::exists('contact', $condition)) { if (DBA::exists('contact', $condition)) {
Contact::remove($contact_id); Contact::remove($contact_id);
} }

2
src/Worker/CronJobs.php
View file

@ -305,7 +305,7 @@ class CronJobs
// Add intro entries for pending contacts // Add intro entries for pending contacts
$pending_contacts = DBA::p("SELECT `uid`, `id`, `url`, `network`, `created` FROM `contact` $pending_contacts = DBA::p("SELECT `uid`, `id`, `url`, `network`, `created` FROM `contact`
WHERE `pending` AND `rel` = ? AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)", 0); //Contact::FOLLOWER); WHERE `pending` AND `rel` IN (?, ?) AND NOT EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id`)", 0, Contact::FOLLOWER);
while ($contact = DBA::fetch($pending_contacts)) { while ($contact = DBA::fetch($pending_contacts)) {
DBA::insert('intro', ['uid' => $contact['uid'], 'contact-id' => $contact['id'], 'blocked' => false, DBA::insert('intro', ['uid' => $contact['uid'], 'contact-id' => $contact['id'], 'blocked' => false,
'hash' => Strings::getRandomHex(), 'datetime' => $contact['created']]); 'hash' => Strings::getRandomHex(), 'datetime' => $contact['created']]);