Move the logic to implicitly allow WebP images

WoltLab · Dec 12, 2024 · 0f7634d · 0f7634d
1 parent b95865d
commit 0f7634d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/wcfsetup/install/files/lib/system/attachment/AttachmentHandler.class.php b/wcfsetup/install/files/lib/system/attachment/AttachmentHandler.class.php
@@ -207,7 +207,23 @@ public function getMaxSize()
      */
     public function getAllowedExtensions()
     {
-        return $this->processor->getAllowedExtensions();
+        $extensions = $this->processor->getAllowedExtensions();
+
+        if (\in_array('*', $extensions)) {
+            return $extensions;
+        }
+
+        // Check if auto scaling is enabled and is set to convert images which
+        // would yield WebP.
+        if (!\ATTACHMENT_IMAGE_AUTOSCALE || \ATTACHMENT_IMAGE_AUTOSCALE_FILE_TYPE === 'keep') {
+            return $extensions;
+        }
+
+        if (!\in_array('webp', $extensions)) {
+            $extensions[] = 'webp';
+        }
+
+        return $extensions;
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/system/file/processor/AttachmentFileProcessor.class.php b/wcfsetup/install/files/lib/system/file/processor/AttachmentFileProcessor.class.php
@@ -37,23 +37,7 @@ public function getAllowedFileExtensions(array $context): array
             return [];
         }
 
-        $extensions = $attachmentHandler->getAllowedExtensions();
-        if (\in_array('*', $extensions)) {
-            return $extensions;
-        }
-
-        // Check if auto scaling is enabled and is set to convert images which
-        // would yield WebP.
-        if (!\ATTACHMENT_IMAGE_AUTOSCALE || \ATTACHMENT_IMAGE_AUTOSCALE_FILE_TYPE === 'keep') {
-            return $extensions;
-        }
-
-        if (!\in_array('webp', $extensions)) {
-            $extensions[] = 'webp';
-        }
-
-        return $extensions;
-    }
+        return $attachmentHandler->getAllowedExtensions();    }
 
     #[\Override]
     public function canAdopt(File $file, array $context): bool