bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #8946 from annando/fix-fatal

Browse source 
Possibly fix a fatal error
This commit is contained in:
Hypolite Petovan 2020-07-29 16:49:35 -04:00 committed by GitHub
commit f4e1acedfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Model/Contact.php
View file

@ -207,7 +207,12 @@ class Contact
if (empty($cid)) {
return [];
}
return self::getById($cid, $fields);
$contact = self::getById($cid, $fields);
if (empty($contact)) {
return [];
}
return $contact;
}
// Add internal fields
@ -238,6 +243,10 @@ class Contact
$contact = DBA::selectFirst('contact', $fields, $condition, $options);
}
if (!DBA::isResult($contact)) {
return [];
}
// Update the contact in the background if needed
if ((($contact['updated'] < DateTimeFormat::utc('now -7 days')) || empty($contact['avatar'])) &&
in_array($contact['network'], Protocol::FEDERATED)) {