upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 08:16:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #45514 from nextcloud/bug/noid/fix-check-for-dark-avatar

Browse source 
fix: use different file name for generated dark avatars
This commit is contained in:
Daniel 2024-06-21 11:11:06 +02:00 committed by GitHub
commit 425e2d0172
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/private/Avatar/UserAvatar.php
View file

@ -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;
}