Ticket #57957: 57957.diff

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

@@ -275 +275 @@
                 $attachment->post_mime_type = $type;
                 $attachment->guid           = $url;
 
+                // If the title was not set, use the filename extracted from the request header.
                 if ( empty( $attachment->post_title ) ) {
-                        $attachment->post_title = preg_replace( '/\.[^.]+$/', '', wp_basename( $file ) );
+                        $content_disposition = $request->get_header( 'content_disposition' );
+
+                        if ( ! empty( $content_disposition ) ) {
+                                $lower_content_disposition = strtolower( $content_disposition );
+
+                                if ( str_starts_with( $lower_content_disposition, 'attachment; filename=' ) ) {
+                                        $tmpfname_disposition = explode( '.', substr( $content_disposition, 21 ) );
+                                        if ( ! empty( $tmpfname_disposition ) ) {
+                                                $attachment->post_title = $tmpfname_disposition[0];
+                                        }
+                                }
+                        } else {
+                                $attachment->post_title = preg_replace( '/\.[^.]+$/', '', wp_basename( $file ) );
+                        }
                 }
 
                 // $post_parent is inherited from $attachment['post_parent'].

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

@@ -1923 +1923 @@
                 $this->assertSame( 1, self::$rest_after_insert_attachment_count );
         }
 
+        /**
+         * Tests that the naming behavior of REST media uploads matches core media uploads.
+         *
+         * In particular, filenames with spaces should maintain the spaces rather than
+         * replacing them with hyphens.
+         *
+         * @ticket 57957
+         *
+         * @covers WP_REST_Attachments_Controller::insert_attachment
+         */
+        public function test_rest_upload_filename_spaces() {
+                wp_set_current_user( self::$editor_id );
+                $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+                $request->set_header( 'Content-Type', 'image/jpeg' );
+                $request->set_header( 'Content-Disposition', 'attachment; filename=Filename With Spaces.jpg' );
+                $request->set_body( file_get_contents( self::$test_file ) );
+
+                $response = rest_get_server()->dispatch( $request );
+                $data     = $response->get_data();
+                $this->assertSame( 201, $response->get_status(), 'The file was not uploaded.' );
+                $this->assertSame( 'Filename With Spaces', $data['title']['raw'], 'An incorrect filename was returned.' );
+        }
+
         /**
          * Ensure the `rest_after_insert_attachment` and `rest_insert_attachment` hooks only fire
          * once when attachments are updated.