Merge pull request #11922 from MrPetovan/bug/notices
Ward against missing keys in Model\APContact::isRelay
This commit is contained in:
commit
b00947025a
|
@ -577,15 +577,15 @@ class APContact
|
||||||
*/
|
*/
|
||||||
public static function isRelay(array $apcontact): bool
|
public static function isRelay(array $apcontact): bool
|
||||||
{
|
{
|
||||||
if ($apcontact['nick'] != 'relay') {
|
if (empty($apcontact['nick']) || $apcontact['nick'] != 'relay') {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($apcontact['type'] == 'Application') {
|
if (!empty($apcontact['type']) && $apcontact['type'] == 'Application') {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (in_array($apcontact['type'], ['Group', 'Service']) && is_null($apcontact['outbox'])) {
|
if (!empty($apcontact['type']) && in_array($apcontact['type'], ['Group', 'Service']) && is_null($apcontact['outbox'])) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user