]> git.mxchange.org Git - friendica.git/commitdiff
Avoid overwriting of avatars for feeds
authorMichael <heluecht@pirati.ca>
Fri, 28 Jun 2019 04:26:49 +0000 (04:26 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 28 Jun 2019 04:26:49 +0000 (04:26 +0000)
src/Model/Contact.php

index fea011978787df9f0d57972d9f9aa539d9a42a5d..f38c69ed05f909ac3a6cb3504e22a8f42f106ed2 100644 (file)
@@ -1452,7 +1452,7 @@ class Contact extends BaseObject
                        }
                }
 
-               if (!empty($data['photo'])) {
+               if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) {
                        self::updateAvatar($data['photo'], $uid, $contact_id);
                }
 
@@ -1854,7 +1854,9 @@ class Contact extends BaseObject
                        }
                }
 
-               self::updateAvatar($ret['photo'], $uid, $id, $update || $force);
+               if ($ret['network'] != Protocol::FEED) {
+                       self::updateAvatar($ret['photo'], $uid, $id, $update || $force);
+               }
 
                if (!$update) {
                        if ($force && ($uid == 0)) {