[6.x] Fix pjpg format being used as file extension in AssetUploader#14134
Merged
jasonvarga merged 1 commit intostatamic:6.xfrom Mar 3, 2026
Merged
Conversation
When a source preset uses 'pjpg' (progressive JPEG), the uploaded file was saved with a .pjpg extension instead of .jpg. This normalization already exists in Glide's Encoder, Server, and Statamic's GlideManager but was missing in AssetUploader::getNewExtension().
lwekuiper
changed the title
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.
When an asset container has a
source_presetwith'fm' => 'pjpg'(progressive JPEG), uploaded images get saved with a.pjpgfile extension instead of.jpg.This happens because
AssetUploader::getNewExtension()returns the raw Glide format value without normalizingpjpgtojpg.This normalization already exists in three other places:
league/glideEncoder.php(lines 68-71)league/glideServer.php(line 400)GlideManager.php(line 192)This PR adds the same normalization to
AssetUploader::getNewExtension().