Fix the processing of extracted EXIF data

See https://www.woltlab.com/community/thread/314222/

Author: dtdesign

ts/WoltLabSuite/Core/Component/File/Upload.ts

@@ -399,7 +399,7 @@ export function setup(): void {
             const result = checksums[i];
 
             if (result.status === "fulfilled") {
-              const exif = exifData.get(validFiles[i]) || null;
+              const exif = exifData.get(validFiles[i]) || exifData.get(files[i]) || null;
               void upload(element, validFiles[i], result.value, exif);
             } else {
               throw new Error(result.reason);

wcfsetup/install/files/js/WoltLabSuite/Core/Component/File/Upload.js

@@ -77,9 +77,20 @@ public static function createFromTemporary(FileTemporary $fileTemporary): File
         $fileSize = $fileTemporary->fileSize;
         $fileHash = $fileTemporary->fileHash;
         if ($isImage) {
+            $exifData = $fileTemporary->exifData;
+            if ($exifData !== null) {
+                $exifData = JSON::decode($exifData);
+            }
+
             $imageWasModified = false;
             try {
-                $imageWasModified = self::normalizeImageRotation($pathname, $width, $height, $mimeType);
+                $imageWasModified = self::normalizeImageRotation(
+                    $pathname,
+                    $width,
+                    $height,
+                    $mimeType,
+                    $exifData,
+                );
             } catch (\Throwable) {
             }
 
@@ -176,7 +187,13 @@ public static function createFromExistingFile(
 
             $imageWasModified = false;
             try {
-                $imageWasModified = self::normalizeImageRotation($pathname, $width, $height, $mimeType);
+                $imageWasModified = self::normalizeImageRotation(
+                    $pathname,
+                    $width,
+                    $height,
+                    $mimeType,
+                    $exifData,
+                );
             } catch (\Throwable) {
             }
 
@@ -221,20 +238,22 @@ public static function createFromExistingFile(
      * Rotating the image can cause the dimensions to change, the image size to
      * differ and the file hash to be different.
      *
+     * @param null|array<string, array<string, mixed>> $exifData
      * @return bool true if the image was modified.
      */
     private static function normalizeImageRotation(
         string $pathname,
         int $width,
         int $height,
-        string $mimeType
+        string $mimeType,
+        ?array $exifData,
     ): bool {
         $adapter = ImageHandler::getInstance()->getAdapter();
         if (!$adapter->checkMemoryLimit($width, $height, $mimeType)) {
             return false;
         }
 
-        $exifData = ExifUtil::getExifData($pathname);
+        $exifData ??= ExifUtil::getExifData($pathname);
         if ($exifData === []) {
             return false;
         }