diff options
| author | Simon L <szaimen@e.mail.de> | 2023-06-19 12:20:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-19 12:20:34 +0200 |
| commit | 43c66b0ecd4f5c4145d498c86292c22f7f8b7fbe (patch) | |
| tree | 0d458382669856adae72632fc8bc33ce0dd73369 /apps/theming | |
| parent | 7b4084f43ab1ab2372d6dbf4be9a2b82f85ba26c (diff) | |
| parent | 53c0790e8f0d6085455ccb23ffb0c0cf9e193930 (diff) | |
| download | nextcloud-server-43c66b0ecd4f5c4145d498c86292c22f7f8b7fbe.tar.gz nextcloud-server-43c66b0ecd4f5c4145d498c86292c22f7f8b7fbe.zip | |
Merge pull request #38851 from nextcloud/backport/38823/stable27
[stable27] generate user themed favicon and touchicon
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/lib/Controller/IconController.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php index 08ee71ac660..1b16293a7f3 100644 --- a/apps/theming/lib/Controller/IconController.php +++ b/apps/theming/lib/Controller/IconController.php @@ -120,14 +120,15 @@ class IconController extends Controller { } catch (NotFoundException $e) { } if ($iconFile === null && $this->imageManager->shouldReplaceIcons()) { + $color = $this->themingDefaults->getColorPrimary(); try { - $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app); + $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app . $color); } catch (NotFoundException $exception) { $icon = $this->iconBuilder->getFavicon($app); if ($icon === false || $icon === '') { return new NotFoundResponse(); } - $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon); + $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app . $color, $icon); } $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']); } @@ -157,14 +158,15 @@ class IconController extends Controller { } catch (NotFoundException $e) { } if ($this->imageManager->shouldReplaceIcons()) { + $color = $this->themingDefaults->getColorPrimary(); try { - $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app); + $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app . $color); } catch (NotFoundException $exception) { $icon = $this->iconBuilder->getTouchIcon($app); if ($icon === false || $icon === '') { return new NotFoundResponse(); } - $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon); + $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app . $color, $icon); } $response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']); } |