keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into post-reason

Browse source
This commit is contained in:
Michael 2022-07-29 21:29:15 +00:00
commit f9bf2424b1
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 = '';
}