Ticket #54476: 54476.2.diff

src/wp-includes/media.php

@@ -3775 +3775 @@
                 }
         }
 
+        /** This filter is documented in wp-includes/class-wp-image-editor.php */
+        $output_format = apply_filters( 'image_editor_output_format', array(), $path, $args['mime_type'] );
+        if ( isset( $output_format[ $args['mime_type'] ] ) ) {
+                $args['output_mime_type'] = $output_format[ $args['mime_type'] ];
+        }
+
         $implementation = _wp_image_editor_choose( $args );
 
         if ( $implementation ) {
@@ -3833 +3839 @@
                         continue;
                 }
 
+                // If both mime type and output type are set, implementation should support both.
+                if (
+                        isset( $args['mime_type'] ) &&
+                        isset( $args['output_mime_type'] ) &&
+                        (
+                                ! call_user_func( array( $implementation, 'supports_mime_type' ), $args['output_mime_type'] ) ||
+                                ! call_user_func( array( $implementation, 'supports_mime_type' ), $args['mime_type'] )
+                        )
+                ) {
+                        continue;
+                }
+
                 if ( isset( $args['mime_type'] ) &&
                         ! call_user_func(
                                 array( $implementation, 'supports_mime_type' ),

tests/phpunit/tests/image/editor.php

@@ -126 +126 @@
                 $this->assertSame( 82, $editor->get_quality(), 'Default quality setting is 82.' );
 
                 // Quality should change to the output format's value.
-                // A PNG image will be converted to WEBP whose quialty should be 86.
+                // A PNG image will be converted to WEBP whose quality should be 86.
                 $editor->save();
                 $this->assertSame( 86, $editor->get_quality(), 'Output image format is WEBP. Quality setting for it should be 86.' );