Skip to content

[stable34] fix(theming): preserve uploaded favicon and touch icon#61302

Open
backportbot[bot] wants to merge 1 commit into
stable34from
backport/61253/stable34
Open

[stable34] fix(theming): preserve uploaded favicon and touch icon#61302
backportbot[bot] wants to merge 1 commit into
stable34from
backport/61253/stable34

Conversation

@backportbot

@backportbot backportbot Bot commented Jun 15, 2026

Copy link
Copy Markdown

Backport of PR #61253

PR #58224 dropped the `$iconFile === null` guard around the app-specific
icon generation in getFavicon()/getTouchIcon(), so an uploaded custom
favicon was always overwritten by the generated, context-colored icon
whenever Imagick could produce an ICO/PNG.

Restore the guard so the generation path only runs as a fallback when no
custom favicon was uploaded, while keeping the improved Imagick
capability detection from #58224.

Assisted-by: ClaudeCode:claude-opus-4-8
Signed-off-by: Simon L. <szaimen@e.mail.de>
@backportbot backportbot Bot requested a review from a team as a code owner June 15, 2026 14:20
@backportbot backportbot Bot requested review from AndyScherzinger, ArtificialOwl, CarlSchwan, leftybournes, nfebe, sorbaugh and szaimen and removed request for a team June 15, 2026 14:20
@backportbot backportbot Bot added this to the Nextcloud 34.0.1 milestone Jun 15, 2026

@szaimen szaimen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but didnt test

@szaimen

szaimen commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

CI failure unrelated afaics

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant