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

Merge pull request #10591 from annando/notice 

Handles PHP Notice:  Undefined index: addr in src/Protocol/Diaspora.php on line 3091
This commit is contained in:
Hypolite Petovan 2021-08-10 08:30:44 -04:00 committed by GitHub
parent 536fbe5af1 56c00ea42d
commit 435c8d2892
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)) {
$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);
@ -3988,13 +3993,7 @@ class Diaspora
}
if (!$recips) {
$recips = q(
"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)
);
$recips = DBA::selectToArray('contact', [], ['network' => Protocol::DIASPORA, 'uid' => $uid, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]);
}
if (!$recips) {