clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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