From 323285216b695014f559782423929f957c03c4ce Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 9 Sep 2019 20:39:19 +0000 Subject: [PATCH] We have to check for "0" in "rel" as well --- mod/notifications.php | 2 +- src/Worker/CronJobs.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index ac642122c2..3276e65491 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -52,7 +52,7 @@ function notifications_post(App $a) // The check for pending is in case the friendship was already approved // and we just want to get rid of the pending contact $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)) { Contact::remove($contact_id); } diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php index 32f9b64aa4..ba48971747 100644 --- a/src/Worker/CronJobs.php +++ b/src/Worker/CronJobs.php @@ -305,7 +305,7 @@ class CronJobs // Add intro entries for pending contacts $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)) { DBA::insert('intro', ['uid' => $contact['uid'], 'contact-id' => $contact['id'], 'blocked' => false, 'hash' => Strings::getRandomHex(), 'datetime' => $contact['created']]);