Ticket #20564: 20564c.diff

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

@@ -421 +421 @@
                 if ( ! empty( $meta ) ) {
                         foreach ( $revisioned_meta_keys as $meta_key ) {
                                 if ( isset( $meta[ $meta_key ] ) ) {
-                                        update_metadata( 'post', $revision_id, $meta_key, $meta[ $meta_key ] );
+                                        update_metadata( 'post', $revision_id, $meta_key, wp_slash( $meta[ $meta_key ] ) );
                                 }
                         }
                 }

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

@@ -341 +341 @@
                 $this->check_create_autosave_response( $response );
         }
 
+        public function test_update_item_with_meta() {
+                wp_set_current_user( self::$editor_id );
+                $request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . self::$post_id . '/autosaves' );
+                $request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
+                register_post_meta(
+                        'post',
+                        'foo',
+                        array(
+                                'show_in_rest'      => true,
+                                'revisions_enabled' => true,
+                                'single'            => true,
+                        )
+                );
+                $params = $this->set_post_data(
+                        array(
+                                'id'     => self::$post_id,
+                                'author' => self::$contributor_id,
+                                'meta'   => array(
+                                        'foo' => 'bar',
+                                ),
+                        )
+                );
+
+                $request->set_body_params( $params );
+                $response = rest_get_server()->dispatch( $request );
+
+                $this->check_create_autosave_response( $response );
+
+                $data = $response->get_data();
+                $this->assertArrayHasKey( 'meta', $data );
+                $this->assertArrayHasKey( 'foo', $data['meta'] );
+                $this->assertSame( 'bar', $data['meta']['foo'] );
+        }
+
+        public function test_update_item_with_json_meta() {
+                $meta = '[{\"content\":\"foot 1\",\"id\":\"fa97a10d-7401-42b9-ac54-df8f4510749a\"},{\"content\":\"fdddddoot 2\\\"\",\"id\":\"2216d0aa-34b8-42b4-b441-84dedc0406e0\"}]';
+                wp_set_current_user( self::$editor_id );
+                $request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . self::$post_id . '/autosaves' );
+                $request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
+                register_post_meta(
+                        'post',
+                        'foo',
+                        array(
+                                'show_in_rest'      => true,
+                                'revisions_enabled' => true,
+                                'single'            => true,
+                        )
+                );
+                $params = $this->set_post_data(
+                        array(
+                                'id'     => self::$post_id,
+                                'author' => self::$contributor_id,
+                                'meta'   => array(
+                                        'foo' => $meta,
+                                ),
+                        )
+                );
+
+                $request->set_body_params( $params );
+                $response = rest_get_server()->dispatch( $request );
+
+                $this->check_create_autosave_response( $response );
+
+                $data = $response->get_data();
+                $this->assertArrayHasKey( 'meta', $data );
+                $this->assertArrayHasKey( 'foo', $data['meta'] );
+                $values = json_decode( wp_unslash( $data['meta']['foo'] ), true );
+                $this->assertNotNull( $values );
+        }
+
         public function test_update_item_nopriv() {
                 wp_set_current_user( self::$contributor_id );
 

tests/phpunit/tests/rest-api/rest-post-meta-fields.php

@@ -3364 +3364 @@
          * Test post meta revisions with a custom post type and the page post type.
          *
          * @group revision
-         * @dataProvider test_revisioned_single_post_meta_with_posts_endpoint_page_and_cpt_data_provider
+         * @dataProvider data_revisioned_single_post_meta_with_posts_endpoint_page_and_cpt_data_provider
          */
         public function test_revisioned_single_post_meta_with_posts_endpoint_page_and_cpt( $passed, $expected, $post_type ) {
 
@@ -3451 +3451 @@
         /**
          * Provide data for the meta revision checks.
          */
-        public function test_revisioned_single_post_meta_with_posts_endpoint_page_and_cpt_data_provider() {
+        public function data_revisioned_single_post_meta_with_posts_endpoint_page_and_cpt_data_provider() {
                 return array(
                         array(
                                 'Test string',
@@ -3468 +3468 @@
                                 false,
                                 'cpt',
                         ),
-
                 );
         }
 }