friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-21 15:26:44 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #11795 from Quix0r/fixes/type-errors

Browse source 
Fixes/type errors
This commit is contained in:
Hypolite Petovan 2022-07-29 08:10:13 -04:00 committed by GitHub
parent a20d05ba39 95ac2aa54b
commit f97a80e2cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Contact.php
View file

@ -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']]);
}
/**

2
src/Protocol/DFRN.php
View file

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