diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Avatar/UserAvatar.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php index ce604394c4e..c5a146a48b6 100644 --- a/lib/private/Avatar/UserAvatar.php +++ b/lib/private/Avatar/UserAvatar.php @@ -169,18 +169,20 @@ class UserAvatar extends Avatar { * @throws NotFoundException */ private function getExtension(bool $generated, bool $darkTheme): string { - if ($darkTheme && !$generated) { - if ($this->folder->fileExists('avatar-dark.jpg')) { - return 'jpg'; - } elseif ($this->folder->fileExists('avatar-dark.png')) { - return 'png'; - } + if ($darkTheme && $generated) { + $name = 'avatar-dark.'; + } else { + $name = 'avatar.'; } - if ($this->folder->fileExists('avatar.jpg')) { + + if ($this->folder->fileExists($name . 'jpg')) { return 'jpg'; - } elseif ($this->folder->fileExists('avatar.png')) { + } + + if ($this->folder->fileExists($name . 'png')) { return 'png'; } + throw new NotFoundException; } |