Changeset 48211

Timestamp:

06/29/2020 10:31:12 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Customize: Do not allow changesets to be deleted when someone is editing them.

This makes the behavior consistent with that of locked posts, which can't be deleted via the list tables when another user is editing them.

Props dlh.
Fixes #50501.

Location:

trunk

Files:

• src/wp-includes/admin-bar.php (modified) (1 diff)
• src/wp-includes/class-wp-customize-manager.php (modified) (1 diff)
• tests/phpunit/tests/ajax/CustomizeManager.php (modified) (1 diff)

trunk/src/wp-includes/admin-bar.php

@@ -426 +426 @@
 
         // Don't show if the user cannot edit a given customize_changeset post currently being previewed.
-        if ( is_customize_preview() && $wp_customize->changeset_post_id() && ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $wp_customize->changeset_post_id() ) ) {
+        if ( is_customize_preview() && $wp_customize->changeset_post_id()
+                && ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $wp_customize->changeset_post_id() )
+        ) {
                 return;
         }

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -3140 +3140 @@
                 }
 
-                if ( $changeset_post_id && ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->delete_post, $changeset_post_id ) ) {
-                        wp_send_json_error(
-                                array(
-                                        'code'    => 'changeset_trash_unauthorized',
-                                        'message' => __( 'Unable to trash changes.' ),
-                                )
-                        );
+                if ( $changeset_post_id ) {
+                        if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->delete_post, $changeset_post_id ) ) {
+                                wp_send_json_error(
+                                        array(
+                                                'code'    => 'changeset_trash_unauthorized',
+                                                'message' => __( 'Unable to trash changes.' ),
+                                        )
+                                );
+                        }
+
+                        $lock_user = (int) wp_check_post_lock( $changeset_post_id );
+
+                        if ( $lock_user && get_current_user_id() !== $lock_user ) {
+                                wp_send_json_error(
+                                        array(
+                                                'code'     => 'changeset_locked',
+                                                'message'  => __( 'Changeset is being edited by other user.' ),
+                                                'lockUser' => $this->get_lock_user_data( $lock_user ),
+                                        )
+                                );
+                        }
                 }
 

trunk/tests/phpunit/tests/ajax/CustomizeManager.php

@@ -514 +514 @@
                 $this->assertEquals( 'changeset_trash_unauthorized', $this->_last_response_parsed['data']['code'] );
                 remove_filter( 'map_meta_cap', array( $this, 'return_do_not_allow' ) );
+
+                $lock_user_id  = static::factory()->user->create( array( 'role' => 'administrator' ) );
+                $previous_user = get_current_user_id();
+                wp_set_current_user( $lock_user_id );
+                $wp_customize->set_changeset_lock( $wp_customize->changeset_post_id() );
+                wp_set_current_user( $previous_user );
+                $this->make_ajax_call( 'customize_trash' );
+                $this->assertFalse( $this->_last_response_parsed['success'] );
+                $this->assertEquals( 'changeset_locked', $this->_last_response_parsed['data']['code'] );
+                delete_post_meta( $wp_customize->changeset_post_id(), '_edit_lock' );
 
                 wp_update_post(