From f8ed0280131f02de58c39852ea8984f639f3e75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Fri, 29 Jul 2022 11:56:41 +0200 Subject: [PATCH 1/2] Changed back to `$cdata`. --- src/Model/Contact.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 3d38005455..a6bb882e86 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -2969,7 +2969,7 @@ class Contact $cdata = self::getPublicAndUserContactID($contact['id'], $contact['uid']); - DI::notification()->deleteForUserByVerb($contact['uid'], Activity::FOLLOW, ['actor-id' => $contact['public']]); + DI::notification()->deleteForUserByVerb($contact['uid'], Activity::FOLLOW, ['actor-id' => $cdata['public']]); } /** From 95ac2aa54bc98e0c2aceec198de6c37aba7914bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Fri, 29 Jul 2022 12:44:34 +0200 Subject: [PATCH 2/2] Fixed a possible NULL value (not valid, at least empty string) --- src/Protocol/DFRN.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 7593711e56..db3360dd16 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -985,7 +985,7 @@ class DFRN Logger::notice('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']); return -22; } - $pubkey = $fcontact['pubkey']; + $pubkey = $fcontact['pubkey'] ?? ''; } else { $pubkey = ''; }