[stable34] fix(theming): preserve uploaded favicon and touch icon#61302
Merged
Conversation
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
Bot
requested review from
AndyScherzinger,
ArtificialOwl,
CarlSchwan,
leftybournes,
nfebe,
sorbaugh and
szaimen
and removed request for
a team
backportbot
Bot
added
bug
3. to review
Contributor
|
CI failure unrelated afaics |
AndyScherzinger
approved these changes
Jun 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of PR #61253