Skip to content

fix(theming): preserve uploaded favicon and touch icon #61253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Jun 15, 2026
+41 −4
Merged

fix(theming): preserve uploaded favicon and touch icon #61253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions apps/theming/lib/Controller/IconController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ public function getFavicon(string $app = 'core'): Response {
$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
} catch (NotFoundException $e) {
}
// retrieve or generate app specific favicon
if (($this->imageManager->canConvert('PNG') || $this->imageManager->canConvert('SVG')) && $this->imageManager->canConvert('ICO')) {
// retrieve or generate app specific favicon, but only if no custom favicon was uploaded
if ($iconFile === null && ($this->imageManager->canConvert('PNG') || $this->imageManager->canConvert('SVG')) && $this->imageManager->canConvert('ICO')) {
$color = $this->themingDefaults->getColorPrimary();
try {
$iconFile = $this->imageManager->getCachedImage('favIcon-' . $app . $color);
Expand Down Expand Up @@ -142,14 +142,15 @@ public function getTouchIcon(string $app = 'core'): Response {
}

$response = null;
$iconFile = null;
// retrieve instance favicon
try {
$iconFile = $this->imageManager->getImage('favicon');
$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => $iconFile->getMimeType()]);
} catch (NotFoundException $e) {
}
// retrieve or generate app specific touch icon
if ($this->imageManager->canConvert('PNG')) {
// retrieve or generate app specific touch icon, but only if no custom favicon was uploaded
if ($iconFile === null && $this->imageManager->canConvert('PNG')) {
$color = $this->themingDefaults->getColorPrimary();
try {
$iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app . $color);
Expand Down
36 changes: 36 additions & 0 deletions apps/theming/tests/Controller/IconControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,24 @@ public function testGetFaviconThemed(): void {
$this->assertEquals($expected, $this->iconController->getFavicon());
}

public function testGetFaviconUploaded(): void {
// a custom favicon was uploaded, so it must be served as-is and the
// app-specific generation path must not overwrite it
$file = $this->iconFileMock('favicon.ico', 'filecontent');
$this->imageManager->expects($this->once())
->method('getImage')
->with('favicon', false)
->willReturn($file);
$this->imageManager->expects($this->never())
->method('getCachedImage');
$this->iconBuilder->expects($this->never())
->method('getFavicon');

$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
$expected->cacheFor(86400);
$this->assertEquals($expected, $this->iconController->getFavicon());
}

public function testGetFaviconDefault(): void {
$this->imageManager->expects($this->once())
->method('getImage')
Expand Down Expand Up @@ -180,6 +198,24 @@ public function testGetTouchIconDefault(): void {
$this->assertEquals($expected, $this->iconController->getTouchIcon());
}

public function testGetTouchIconUploaded(): void {
// a custom favicon was uploaded, so it must be served as-is and the
// app-specific generation path must not overwrite it
$file = $this->iconFileMock('favicon.png', 'filecontent');
$this->imageManager->expects($this->once())
->method('getImage')
->with('favicon')
->willReturn($file);
$this->imageManager->expects($this->never())
->method('getCachedImage');
$this->iconBuilder->expects($this->never())
->method('getTouchIcon');

$expected = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'image type']);
$expected->cacheFor(86400);
$this->assertEquals($expected, $this->iconController->getTouchIcon());
}

public function testGetTouchIconFail(): void {
$this->imageManager->expects($this->once())
->method('getImage')
Expand Down
Loading