Fix "TypeError: Argument 1 passed to Friendica\Util\Strings::compareLink() must be...

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 8d2969b72e4941203f8fa79716f877652669943d..3ea78a38951f164a56afd43c0d963f4490ea62d8 100644 (file)
--- 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 = '';
                }