Changeset 56163

Timestamp:

07/07/2023 05:51:11 PM (2 years ago)

Author:

adamsilverstein

Message:

Revisions: return existing autosave after saving with unchanged data.

Correctly return the existing autosave when an unchanged autosave is saved, instead of returning an error.

Fix regressions after r55154 where an error and not the original autosave was returned when saving with unchanged data (for example, clicking the preview button repeatedly). Returning the autosave (ID) is the expected behavior for the endpoint.

Follow up to [55154]

Props Mamaduka, jeroenrotty, mrfoxtalbot.
Fixes #58739.

Location:

trunk

Files:

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

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

@@ -372 +372 @@
         }
 
-        if ( ! $autosave_is_different ) {
-            return new WP_Error(
-                'rest_autosave_no_changes',
-                __( 'There is nothing to save. The autosave and the post content are the same.' ),
-                array( 'status' => 400 )
-            );
-        }
-
         $user_id = get_current_user_id();
 
         // Store one autosave per author. If there is already an autosave, overwrite it.
         $old_autosave = wp_get_post_autosave( $post_id, $user_id );
+
+        if ( ! $autosave_is_different && $old_autosave ) {
+            // Nothing to save, return the existing autosave.
+            return $old_autosave->ID;
+        }
 
         if ( $old_autosave ) {

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

@@ -689 +689 @@
         );
         $post_id   = wp_insert_post( $post_data );
-
-        wp_set_current_user( self::$editor_id );
-
+        wp_set_current_user( self::$editor_id );
+
+        // Make a small change create the initial autosave.
         $autosave_data = array(
-            'post_content' => $post_data['post_content'],
-        );
-
-        // Create autosaves response.
-        $request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . $post_id . '/autosaves' );
+            'post_content' => 'Test post content changed',
+        );
+        $request       = new WP_REST_Request( 'POST', '/wp/v2/posts/' . $post_id . '/autosaves' );
         $request->add_header( 'Content-Type', 'application/json' );
         $request->set_body( wp_json_encode( $autosave_data ) );
-
-        $response = rest_get_server()->dispatch( $request );
-        $data     = $response->get_data();
-
-        $this->assertSame( 400, $response->get_status(), 'Response status is not 400.' );
-        $this->assertSame( 'rest_autosave_no_changes', $data['code'], 'Response "code" is not "rest_autosave_no_changes"' );
+        $response = rest_get_server()->dispatch( $request );
+
+        $this->assertSame( 200, $response->get_status() );
+
+        // Store the first autosave ID.
+        $autosave = $response->get_data();
+
+        // Try creating an autosave using the REST endpoint with unchanged content.
+        $request->set_body( wp_json_encode( $autosave_data ) );
+
+        $response = rest_get_server()->dispatch( $request );
+        $data     = $response->get_data();
+
+        $this->assertSame( 200, $response->get_status() );
+        $this->assertSame( $autosave['id'], $data['id'], 'Original autosave was not returned' );
     }
 }