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

Handles PHP Notice: Undefined index: addr in src/Protocol/Diaspora.php on line 3091

Browse source
This commit is contained in:
Michael 2021-08-10 03:50:43 +00:00
parent 536fbe5af1
commit 56c00ea42d
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Protocol/Diaspora.php
View file

@ -3082,6 +3082,11 @@ class Diaspora
if (!empty($fcontact)) { if (!empty($fcontact)) {
$pubkey = $fcontact['pubkey']; $pubkey = $fcontact['pubkey'];
} }
} else {
// The "addr" field should always be filled.
// If this isn't the case, it will raise a notice some lines later.
// And in the log we will see where it came from and we can handle it there.
Logger::notice('Empty addr', ['contact' => $contact ?? [], 'callstack' => System::callstack(20)]);
} }
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $pubkey, $public_batch); $envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $pubkey, $public_batch);
@ -3988,13 +3993,7 @@ class Diaspora
} }
if (!$recips) { if (!$recips) {
$recips = q( $recips = DBA::selectToArray('contact', [], ['network' => Protocol::DIASPORA, 'uid' => $uid, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]);
"SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
AND `uid` = %d AND `rel` != %d",
DBA::escape(Protocol::DIASPORA),
intval($uid),
intval(Contact::SHARING)
);
} }
if (!$recips) { if (!$recips) {