Skip to content

Fix .jpeg extension mismatch when mime option is jpeg #320

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

Open
wakqasahmed wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix .jpeg extension mismatch when mime option is jpeg #320

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a28096
Fix .jpeg extension mismatch when mime option is jpeg (#160)
aheinze Aug 16, 2026
afe0d59
Normalize mime/ext before hash construction, fix jpeg extension misma…
aheinze Aug 16, 2026
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
45 changes: 37 additions & 8 deletions modules/Assets/Helper/Asset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ public function image(array $options = [], bool $asPath = false) {
'smartcrop' => null
], $options);

[$mime, $ext] = $this->normalizeImageMime($options['mime']);
$options['mime'] = $mime;

\extract($options);

if (!$width && !$height) {
Expand All @@ -88,7 +91,7 @@ public function image(array $options = [], bool $asPath = false) {
return ['error' => 'Missing src parameter'];
}

$hash = $mime ? \md5(\json_encode($options))."_{$quality}_{$mode}.{$mime}" : null;
$hash = $mime ? \md5(\json_encode($options))."_{$quality}_{$mode}.{$ext}" : null;

if (!$rebuild && $mime) {

Expand All @@ -97,7 +100,7 @@ public function image(array $options = [], bool $asPath = false) {
if ($this->app->fileStorage->fileExists($thumbpath)) {

if ($base64) {
return "data:image/{$mime};base64,".\base64_encode($this->app->fileStorage->read($thumbpath));
return "data:{$mime};base64,".\base64_encode($this->app->fileStorage->read($thumbpath));
}

return $asPath ? $thumbpath : $this->app->fileStorage->getURL($thumbpath);
Expand All @@ -124,6 +127,32 @@ public function image(array $options = [], bool $asPath = false) {

}

/**
* Normalize a user-supplied mime/extension option into a canonical
* [mime, extension] pair, e.g. 'jpeg', 'jpg' and 'image/jpeg' all
* normalize to ['image/jpeg', 'jpg']. Must run before any cache hash
* is built from the mime option so the hash and the output filename
* always agree.
*
* @param string|null $mime
* @return array{0: string|null, 1: string|null}
*/
protected function normalizeImageMime(?string $mime): array {

if (!$mime) return [null, null];

if (\substr($mime, 0, 6) == 'image/') $mime = \substr($mime, 6);
if ($mime === 'jpg') $mime = 'jpeg';

if (!\in_array($mime, ['avif', 'gif', 'jpeg', 'png', 'webp', 'bmp'])) {
return [null, null];
}

$ext = ($mime === 'jpeg') ? 'jpg' : $mime;

return ["image/{$mime}", $ext];
}

protected function imageByAsset(array $options = [], bool $asPath = false, ?string $hash = null) {

\extract($options);
Expand Down Expand Up @@ -220,12 +249,11 @@ protected function imageByPath(array $options = [], bool $asPath = false, ?strin
$mode = 'thumbnail';
}

if ($mime && \substr($mime, 0, 6) == 'image/') $mime = \substr($mime, 6);
if ($mime === 'jpg') $mime = 'jpeg';
[$normalizedMime, $normalizedExt] = $this->normalizeImageMime($mime);

if ($mime && \in_array($mime, ['avif', 'gif', 'jpeg', 'png', 'webp', 'bmp'])) {
$ext = $mime;
$mime = "image/{$ext}";
if ($normalizedMime) {
$mime = $normalizedMime;
$ext = $normalizedExt;
} else {
$mime = null;
}
Expand Down Expand Up @@ -297,7 +325,8 @@ protected function imageByPath(array $options = [], bool $asPath = false, ?strin
}

if ($base64) {
return "data:image/{$ext};base64,".\base64_encode($this->app->fileStorage->read($thumbpath));
$dataMime = $mime ?: ($ext === 'jpg' ? 'image/jpeg' : "image/{$ext}");
return "data:{$dataMime};base64,".\base64_encode($this->app->fileStorage->read($thumbpath));
}

return $asPath ? $thumbpath : $this->app->fileStorage->getURL($thumbpath);
Expand Down