friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-26 01:16:04 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #14187 from annando/error

Browse source 
Fix "TypeError: Argument 1 passed to Friendica\Util\Strings::compareLink() must be of the type string, null given"
This commit is contained in:
Hypolite Petovan 2024-05-27 19:08:06 -04:00 committed by GitHub
parent 99aec68582 fd508fa423
commit 87da9c98f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Model/Contact.php
View file

@ -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 = '';
}