From 8838a1f2d16fb30869962207c8b729a481621ce4 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 28 Jun 2019 04:26:49 +0000 Subject: [PATCH] Avoid overwriting of avatars for feeds --- src/Model/Contact.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index fea0119787..f38c69ed05 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -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)) { -- 2.39.5