friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Avoid overwriting of avatars for feeds

This commit is contained in:
Michael 2019-06-28 04:26:49 +00:00
parent 96651ae76d
commit 8838a1f2d1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Contact.php
View 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); 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 (!$update) {
if ($force && ($uid == 0)) { if ($force && ($uid == 0)) {