Merge pull request #7042 from annando/apcontact-update

Follow up to #7036: Automatically update AP contacts
This commit is contained in:
Tobias Diekershoff 2019-04-25 08:05:13 +02:00 committed by GitHub
commit a17eb1e04c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -89,12 +89,12 @@ class APContact extends BaseObject
$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]); $apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
} }
if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update)) { if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update) && !empty($apcontact['pubkey'])) {
return $apcontact; return $apcontact;
} }
if (!is_null($update)) { if (!is_null($update)) {
return false; return DBA::isResult($apcontact) ? $apcontact : false;
} }
} }