Repair missing contact photos

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 0540bf7bebd3f812a50be9da135acdbf1284c939..7722b6990956e825b3116233779ae339e4f30ac1 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1896,6 +1896,14 @@ class Contact
                        $data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
                }
 
+               foreach ($data as $image_uri) {
+                       $image_rid = Photo::ridFromURI($image_uri);
+                       if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
+                               Logger::info('Regenerating avatar for contact uid ' . $uid . ' cid ' . $cid . ' missing photo ' . $image_rid . ' avatar ' . $contact['avatar']);
+                               $force = true;
+                       }
+               }
+
                if (($contact["avatar"] != $avatar) || $force) {
                        $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);