Handles PHP Notice: Undefined index: addr in src/Protocol/Diaspora.php on line 3091
This commit is contained in:
parent
536fbe5af1
commit
56c00ea42d
|
@ -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) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user