Fix the replacement of converted images

Author: dtdesign

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

@@ -29,8 +29,8 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
         $file = Helper::fetchObjectFromRequestParameter($variables['id'], File::class);
 
         $file = FileProcessor::getInstance()->generateWebpVariant($file);
-        $file = FileProcessor::getInstance()->convertImageFormat($file);
         $file = FileProcessor::getInstance()->stripExif($file);
+        $file = FileProcessor::getInstance()->convertImageFormat($file);
         FileProcessor::getInstance()->generateThumbnails($file);
 
         $thumbnails = [];
@@ -42,7 +42,7 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
         }
 
         return new JsonResponse([
-            'filename' => 'test.bin',// $file->filename,
+            'filename' => $file->filename,
             'fileSize' => $file->fileSize,
             'mimeType' => $file->mimeType,
             'thumbnails' => $thumbnails,

wcfsetup/install/files/lib/system/file/command/ReplaceFileSource.class.php

@@ -121,6 +121,29 @@ private function replaceSource(): File
                 \unlink($this->file->getPathname());
             }
 
+            // Move the WebP thumbnail to the new location.
+            $webpVariant = $this->file->getPathnameWebp();
+            if ($webpVariant !== null) {
+                if ($updatedFile->mimeType === 'image/webp') {
+                    // The file might be missing if it was used to replace the
+                    // original version with it.
+                    @\unlink($webpVariant);
+
+                    (new FileEditor($updatedFile))->update([
+                        'fileHashWebp' => null,
+                    ]);
+                    $updatedFile = new File($updatedFile->fileID);
+                } else {
+                    $newWebpVariant = $updatedFile->getPathnameWebp();
+                    \assert($newWebpVariant !== null);
+
+                    \rename(
+                        $webpVariant,
+                        $newWebpVariant,
+                    );
+                }
+            }
+
             WCF::getDB()->commitTransaction();
             $committed = true;
 
@@ -168,8 +191,8 @@ private function regenerateExistingThumbnails(File $file): void
 
         try {
             $file = FileProcessor::getInstance()->generateWebpVariant($file);
-            $file = FileProcessor::getInstance()->convertImageFormat($file);
             $file = FileProcessor::getInstance()->stripExif($file);
+            $file = FileProcessor::getInstance()->convertImageFormat($file);
             FileProcessor::getInstance()->generateThumbnails($file);
         } catch (DamagedImage $e) {
             logThrowable($e);

wcfsetup/install/files/lib/system/worker/FileRebuildDataWorker.class.php

@@ -53,8 +53,8 @@ public function execute()
         foreach ($this->objectList->getObjects() as $file) {
             try {
                 $file = FileProcessor::getInstance()->generateWebpVariant($file);
-                $file = FileProcessor::getInstance()->convertImageFormat($file);
                 $file = FileProcessor::getInstance()->stripExif($file);
+                $file = FileProcessor::getInstance()->convertImageFormat($file);
                 FileProcessor::getInstance()->generateThumbnails($file);
             } catch (DamagedImage $e) {
                 logThrowable($e);