Changeset 43530

Timestamp:

07/24/2018 04:53:17 PM (6 years ago)

Author:

SergeyBiryukov

Message:

REST API: Ensure attachments created with WP_REST_Attachments_Controller::create_item() on Windows have a relative path.

Props ocean90, SergeyBiryukov, redcastor.
Merges [43529] to the 4.9 branch.
Fixes #40861.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• 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)

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

@@ -137 +137 @@
 
         $attachment = $this->prepare_item_for_database( $request );
-        $attachment->file = $file;
         $attachment->post_mime_type = $type;
         $attachment->guid = $url;
@@ -145 +144 @@
         }
 
-        $id = wp_insert_post( wp_slash( (array) $attachment ), true );
+        // $post_parent is inherited from $attachment['post_parent'].
+        $id = wp_insert_attachment( wp_slash( (array) $attachment ), $file, 0, true );
 
         if ( is_wp_error( $id ) ) {

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

@@ -696 +696 @@
         $attachment = $response->get_data();
         $this->assertEquals( '', $attachment['alt_text'] );
+    }
+
+    /**
+     * @ticket 40861
+     */
+    public function test_create_item_ensure_relative_path() {
+        wp_set_current_user( self::$author_id );
+        $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+        $request->set_header( 'Content-Type', 'image/jpeg' );
+        $request->set_header( 'Content-Disposition', 'attachment; filename=canola.jpg' );
+        $request->set_body( file_get_contents( $this->test_file ) );
+        $response   = rest_get_server()->dispatch( $request );
+        $attachment = $response->get_data();
+        $this->assertNotContains( ABSPATH, get_post_meta( $attachment['id'], '_wp_attached_file', true ) );
     }