Changeset 54130

Timestamp:

09/11/2022 10:33:29 PM (2 years ago)

Author:

antpb

Message:

Autosave/REST API: Block autosaving from overwriting changes when locked from editing.

Previously when a user was locked from editing a post in the block editor, autosave functionality was allowed to overwrite changes made by the editor that has taken control. This patch honors the lock status keeping autosave from conflicitng with other content editors.

Props jhart35, adamsilverstein, sathyapulse, chanthaboune, primetimejas, joemcgill, kadamwhite.
Fixes #55659.

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

@@ -221 +221 @@
         $user_id           = get_current_user_id();
 
-        if ( ( 'draft' === $post->post_status || 'auto-draft' === $post->post_status ) && $post->post_author == $user_id ) {
+        // We need to check post lock to ensure the original author didn't leave their browser tab open.
+        if ( ! function_exists( 'wp_check_post_lock' ) ) {
+            require_once ABSPATH . 'wp-admin/includes/post.php';
+        }
+
+        $post_lock = wp_check_post_lock( $post->ID );
+        $is_draft  = 'draft' === $post->post_status || 'auto-draft' === $post->post_status;
+
+        if ( $is_draft && (int) $post->post_author === $user_id && ! $post_lock ) {
             // Draft posts for the same author: autosaving updates the post and does not create a revision.
             // Convert the post object to an array and add slashes, wp_update_post() expects escaped array.

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

@@ -608 +608 @@
         $this->assertNotEquals( 'garbage', get_post( self::$draft_page_id )->comment_status );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }