Skip to content

Commit d58780e

Browse files
committed
Move the format conversion and EXIF removal into SaveChunk
See #6361 (comment)
1 parent 163890c commit d58780e

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

wcfsetup/install/files/lib/system/endpoint/controller/core/files/GenerateThumbnails.class.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
2828
{
2929
$file = Helper::fetchObjectFromRequestParameter($variables['id'], File::class);
3030

31-
$file = FileProcessor::getInstance()->generateWebpVariant($file);
32-
$file = FileProcessor::getInstance()->convertImageFormat($file);
33-
$file = FileProcessor::getInstance()->stripExif($file);
3431
FileProcessor::getInstance()->generateThumbnails($file);
3532

3633
$thumbnails = [];

wcfsetup/install/files/lib/system/endpoint/controller/core/files/upload/SaveChunk.class.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,17 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
133133
}
134134
}
135135

136+
if ($file->isImage()) {
137+
$file = FileProcessor::getInstance()->generateWebpVariant($file);
138+
$file = FileProcessor::getInstance()->convertImageFormat($file);
139+
$file = FileProcessor::getInstance()->stripExif($file);
140+
}
141+
136142
$generateThumbnails = false;
137143
if ($processor !== null && $file->isImage()) {
138144
$thumbnailFormats = $processor->getThumbnailFormats();
139145
if ($thumbnailFormats !== []) {
140146
$generateThumbnails = true;
141-
} else if (\IMAGE_CONVERT_FORMAT !== 'keep' || \IMAGE_STRIP_EXIF) {
142-
// The action to generate thumbnails implicitly handles the
143-
// format conversion and EXIF removal.
144-
$generateThumbnails = true;
145147
}
146148
}
147149

0 commit comments

Comments
 (0)