Changeset 60196

Timestamp:

04/28/2025 03:55:35 PM (17 months ago)

Author:

desrosj

Message:

Media: Don't try to resize image formats which can't be resized

While having a mime type with an "image" prefix, SVG images are in fact "Scalable Vector Graphics" that can be scaled directly.

Follow-up to [60084].

Reviewed by desrosj.
Backports [60195] to the 6.8 branch.

Props sirlouen, adamsilverstein, audrasjb, pbiron, sainathpoojary, dilipbheda, pratiklondhe.
Fixes #63302. See #61167.

Location:

branches/6.8

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-attachments-controller.php (modified) (3 diffs)

branches/6.8/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -156 +156 @@
                         str_starts_with( $files['file']['type'], 'image/' )
                 ) {
-                        // Check if the image editor supports the type.
-                        if ( ! wp_image_editor_supports( array( 'mime_type' => $files['file']['type'] ) ) ) {
+                        // List of non-resizable image formats.
+                        $editor_non_resizable_formats = array(
+                                'image/svg+xml',
+                        );
+
+                        // Check if the image editor supports the type or ignore if it isn't a format resizable by an editor.
+                        if (
+                                ! in_array( $files['file']['type'], $editor_non_resizable_formats, true ) &&
+                                ! wp_image_editor_supports( array( 'mime_type' => $files['file']['type'] ) )
+                        ) {
                                 return new WP_Error(
                                         'rest_upload_image_type_not_supported',

branches/6.8/tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -34 +34 @@
 
         /**
+         * @var string The path to the SVG test image.
+         */
+        private static $test_svg_file;
+
+        /**
          * @var array The recorded posts query clauses.
          */
@@ -114 +119 @@
                 if ( ! file_exists( self::$test_avif_file ) ) {
                         copy( $orig_avif_file, self::$test_avif_file );
+                }
+
+                $test_svg_file       = DIR_TESTDATA . '/uploads/video-play.svg';
+                self::$test_svg_file = get_temp_dir() . 'video-play.svg';
+                if ( ! file_exists( self::$test_svg_file ) ) {
+                        copy( $test_svg_file, self::$test_svg_file );
                 }
 
@@ -2604 +2615 @@
                 $this->assertSame( 201, $response->get_status() );
         }
+
+        /**
+         * Test that uploading an SVG image doesn't throw a `rest_upload_image_type_not_supported` error.
+         *
+         * @ticket 63302
+         */
+        public function test_upload_svg_image() {
+                wp_set_current_user( self::$editor_id );
+                $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+                $request->set_header( 'Content-Type', 'image/svg+xml' );
+                $request->set_file_params(
+                        array(
+                                'file' => array(
+                                        'file'     => file_get_contents( self::$test_svg_file ),
+                                        'name'     => 'video-play.svg',
+                                        'size'     => filesize( self::$test_svg_file ),
+                                        'tmp_name' => self::$test_svg_file,
+                                        'type'     => 'image/svg+xml',
+                                ),
+                        )
+                );
+                $rest_controller = new WP_REST_Attachments_Controller( 'attachment' );
+                $result          = $rest_controller->create_item_permissions_check( $request );
+
+                $this->assertTrue( $result );
+        }
 }