[6.x] Prevent the icon fieldtype from 500ing when the stored icon no longer exists#14881
Open
mynetx wants to merge 1 commit into
Open
[6.x] Prevent the icon fieldtype from 500ing when the stored icon no longer exists#14881mynetx wants to merge 1 commit into
mynetx wants to merge 1 commit into
Conversation
IconSet::get() loaded the SVG with no existence check, so a stored icon value that no longer exists in the configured set (e.g. icons removed in the v5 to v6 redesign) threw a FileNotFoundException and 500'd the page. Return null for a missing icon instead; Icon::augment() already treats null as an empty value.
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
1 participant
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.
A stored icon value that no longer exists in the configured set throws a
FileNotFoundExceptionand 500s the page during augmentation. This bites after the v5 → v6 icon redesign, where icons likeswapwere removed, so existing content that references them now crashes on the front end.IconSet::get()now checks the file exists and returnsnullwhen it doesn't, matching thesvgtag's behaviour.Icon::augment()already short-circuits on a null, so it's a no-op for callers.Fixes #14669