Follow up to #7036: Automatically update AP contacts

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 161a231f00d89ec958245694a6c4fe243d687099..c2dbcf590a629f983e615f7417e70559b54546a4 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -89,12 +89,12 @@ class APContact extends BaseObject
                                $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;
                        }
 
                        if (!is_null($update)) {
-                               return false;
+                               return DBA::isResult($apcontact) ? $apcontact : false;
                        }
                }