Properly clear cached avatars

Signed-off-by: jld3103 <jld3103yt@gmail.com>

diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php
index 5c4f04de6d6106856427152e430f996aa49eaf6b..4125c8eb0a85236b8d0e4967ccaa7a772220b90a 100644 (file)
--- a/lib/private/Avatar/AvatarManager.php
+++ b/lib/private/Avatar/AvatarManager.php
@@ -160,13 +160,8 @@ class AvatarManager implements IAvatarManager {
        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();
                }
        }