tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12670 from annando/fix-avatar-cache

Browse source 
Ensure to reset the avatar paths when deleting avatar cache
This commit is contained in:
Hypolite Petovan 2023-01-14 09:47:21 -05:00 committed by GitHub
parent 91ff24b0e4 3e3f2555dc
commit 2d555b60dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Contact/Avatar.php
View file

@ -246,13 +246,16 @@ class Avatar
* Delete locally cached avatar pictures of a contact * Delete locally cached avatar pictures of a contact
* *
* @param string $avatar * @param string $avatar
* @return void * @return bool
*/ */
public static function deleteCache(array $contact) public static function deleteCache(array $contact): bool
{ {
$existed = (self::isCacheFile($contact['photo']) || self::isCacheFile($contact['thumb']) || self::isCacheFile($contact['micro']));
self::deleteCacheFile($contact['photo']); self::deleteCacheFile($contact['photo']);
self::deleteCacheFile($contact['thumb']); self::deleteCacheFile($contact['thumb']);
self::deleteCacheFile($contact['micro']); self::deleteCacheFile($contact['micro']);
return $existed;
} }
/** /**

4
src/Model/Contact.php
View file

@ -2252,7 +2252,9 @@ class Contact
} }
if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || $cache_avatar) { if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || $cache_avatar) {
Avatar::deleteCache($contact); if (Avatar::deleteCache($contact)) {
$force = true;
}
if ($default_avatar && Proxy::isLocalImage($avatar)) { if ($default_avatar && Proxy::isLocalImage($avatar)) {
$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(), $fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),