Changeset 61980

Timestamp:

03/12/2026 05:33:00 AM (2 months ago)

Author:

adamsilverstein

Message:

Media: skip server image support check when using client-side media.

When uploading images via the REST API with generate_sub_sizes set to false, skip server support checks since processing is handled on the client side. Fix an issue where uploads of formats like AVIF fail with rest_upload_image_type_not_supported, even though the client will handle all image processing and the server doesn't need to support the format.

See also ​https://github.com/WordPress/gutenberg/issues/76369 and ​https://github.com/WordPress/gutenberg/pull/76371.

Props adamsilverstein, westonruter, andrewserong, mukesh27.
Fixes #64836. See #62717.

Location:

trunk

Files:

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

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

@@ -233 +233 @@
         $prevent_unsupported_uploads = apply_filters( 'wp_prevent_unsupported_mime_type_uploads', true, $files['file']['type'] ?? null );
 
+        // When the client handles image processing (generate_sub_sizes is false),
+        // skip the server-side image editor support check.
+        if ( false === $request['generate_sub_sizes'] ) {
+            $prevent_unsupported_uploads = false;
+        }
+
         // If the upload is an image, check if the server can handle the mime type.
         if (
@@ -279 +285 @@
 
         // Handle generate_sub_sizes parameter.
-        if ( isset( $request['generate_sub_sizes'] ) && ! $request['generate_sub_sizes'] ) {
+        if ( false === $request['generate_sub_sizes'] ) {
             add_filter( 'intermediate_image_sizes_advanced', '__return_empty_array', 100 );
             add_filter( 'fallback_intermediate_image_sizes', '__return_empty_array', 100 );

trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -2931 +2931 @@
 
     /**
+     * Test that unsupported image type check is skipped when not generating sub-sizes.
+     *
+     * When the client handles image processing (generate_sub_sizes is false),
+     * the server should not check image editor support.
+     *
+     * Tests the permissions check directly with file params set, since the core
+     * check uses get_file_params() which is only populated for multipart uploads.
+     *
+     * @ticket 64836
+     */
+    public function test_upload_unsupported_image_type_skipped_when_not_generating_sub_sizes() {
+        wp_set_current_user( self::$author_id );
+
+        add_filter( 'wp_image_editors', '__return_empty_array' );
+
+        $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+        $request->set_file_params(
+            array(
+                'file' => array(
+                    'name'     => 'avif-lossy.avif',
+                    'type'     => 'image/avif',
+                    'tmp_name' => self::$test_avif_file,
+                    'error'    => 0,
+                    'size'     => filesize( self::$test_avif_file ),
+                ),
+            )
+        );
+        $request->set_param( 'generate_sub_sizes', false );
+
+        $controller = new WP_REST_Attachments_Controller( 'attachment' );
+        $result     = $controller->create_item_permissions_check( $request );
+
+        // Should pass because generate_sub_sizes is false (client handles processing).
+        $this->assertTrue( $result );
+    }
+
+    /**
+     * Test that unsupported image type check is enforced when generating sub-sizes.
+     *
+     * When the server handles image processing (generate_sub_sizes is true),
+     * the server should still check image editor support.
+     *
+     * Tests the permissions check directly with file params set, since the core
+     * check uses get_file_params() which is only populated for multipart uploads.
+     *
+     * @ticket 64836
+     */
+    public function test_upload_unsupported_image_type_enforced_when_generating_sub_sizes() {
+        wp_set_current_user( self::$author_id );
+
+        add_filter( 'wp_image_editors', '__return_empty_array' );
+
+        $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+        $request->set_file_params(
+            array(
+                'file' => array(
+                    'name'     => 'avif-lossy.avif',
+                    'type'     => 'image/avif',
+                    'tmp_name' => self::$test_avif_file,
+                    'error'    => 0,
+                    'size'     => filesize( self::$test_avif_file ),
+                ),
+            )
+        );
+
+        $controller = new WP_REST_Attachments_Controller( 'attachment' );
+        $result     = $controller->create_item_permissions_check( $request );
+
+        // Should fail because the server needs to generate sub-sizes but can't.
+        $this->assertWPError( $result );
+        $this->assertSame( 'rest_upload_image_type_not_supported', $result->get_error_code() );
+    }
+
+    /**
      * Test that uploading an SVG image doesn't throw a `rest_upload_image_type_not_supported` error.
      *