From fd508fa4230710ff332001be2a75da9c27a119dd Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 27 May 2024 19:23:29 +0000 Subject: [PATCH] Fix "TypeError: Argument 1 passed to Friendica\Util\Strings::compareLink() must be of the type string, null given" --- src/Model/Contact.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 8d2969b72e..3ea78a3895 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -3557,6 +3557,10 @@ class Contact */ public static function magicLinkById(int $cid, string $url = ''): string { + if (($url == '') && DI::userSession()->isAuthenticated() && DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'stay_local')) { + return 'contact/' . $cid . '/conversations'; + } + $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'alias', 'uid'], ['id' => $cid]); return self::magicLinkByContact($contact, $url); @@ -3584,7 +3588,7 @@ class Contact return 'contact/' . $contact['id'] . '/conversations'; } - if (Strings::compareLink($contact['url'], $url) || Strings::compareLink($contact['alias'], $url)) { + if (Strings::compareLink($contact['url'], $url) || Strings::compareLink($contact['alias'] ?? '', $url)) { $url = ''; }