Changeset 59367 for branches/6.7/src/wp-admin/includes/image.php

Timestamp:

11/07/2024 01:25:10 AM (15 months ago)

Author:

peterwilsoncc

Message:

Media: Fix converting of all HEIC/HEIF images to JPEGs after uploading regardless of dimensions.

This backport includes follow up commits to improve a variable name and improve accuracy of when an image needs to be converted.

Reviewed by peterwilsoncc.
Merges [59317], [59346], [59366] to the 6.7 branch.

Props ironprogrammer, adamsilverstein, azaozz, peterwilsoncc, apermo, flixos90.
Fixes #62305.

Location:

branches/6.7

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/image.php (modified) (4 diffs)

branches/6.7/src/wp-admin/includes/image.php

@@ -292 +292 @@
          * scale the image and use it as the "full" size.
          */
+        $scale_down = false;
+        $convert    = false;
+
         if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) {
+            // The image will be converted if needed on saving.
+            $scale_down = true;
+        } else {
+            // The image may need to be converted regardless of its dimensions.
+            $output_format = wp_get_image_editor_output_format( $file, $imagesize['mime'] );
+
+            if (
+                is_array( $output_format ) &&
+                array_key_exists( $imagesize['mime'], $output_format ) &&
+                $output_format[ $imagesize['mime'] ] !== $imagesize['mime']
+            ) {
+                $convert = true;
+            }
+        }
+
+        if ( $scale_down || $convert ) {
             $editor = wp_get_image_editor( $file );
 
@@ -300 +319 @@
             }
 
-            // Resize the image.
-            $resized = $editor->resize( $threshold, $threshold );
+            if ( $scale_down ) {
+                // Resize the image. This will also convet it if needed.
+                $resized = $editor->resize( $threshold, $threshold );
+            } elseif ( $convert ) {
+                // The image will be converted (if possible) when saved.
+                $resized = true;
+            }
+
             $rotated = null;
 
@@ -307 +332 @@
             if ( ! is_wp_error( $resized ) && is_array( $exif_meta ) ) {
                 $resized = $editor->maybe_exif_rotate();
-                $rotated = $resized;
+                $rotated = $resized; // bool true or WP_Error
             }
 
@@ -315 +340 @@
                  * This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
                  */
-                $saved = $editor->save( $editor->generate_filename( 'scaled' ) );
+                if ( $scale_down ) {
+                    $saved = $editor->save( $editor->generate_filename( 'scaled' ) );
+                } else {
+                    $saved = $editor->save();
+                }
 
                 if ( ! is_wp_error( $saved ) ) {