From 8ab71af6bf21ed09c4ff7d87f4d927ffdc5b5935 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Tue, 9 May 2023 12:23:57 +0200 Subject: [PATCH] Properly clear cached avatars Signed-off-by: jld3103 --- lib/private/Avatar/AvatarManager.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php index 5c4f04de6d610..4125c8eb0a852 100644 --- a/lib/private/Avatar/AvatarManager.php +++ b/lib/private/Avatar/AvatarManager.php @@ -160,13 +160,8 @@ public function getAvatar(string $userId) : IAvatar { public function clearCachedAvatars() { $users = $this->config->getUsersForUserValue('avatar', 'generated', 'true'); foreach ($users as $userId) { - try { - $folder = $this->appData->getFolder($userId); - $folder->delete(); - } catch (NotFoundException $e) { - $this->logger->debug("No cache for the user $userId. Ignoring..."); - } - $this->config->setUserValue($userId, 'avatar', 'generated', 'false'); + // This also bumps the avatar version leading to cache invalidation in browsers + $this->getAvatar($userId)->remove(); } }