Changeset 42623 for branches/4.9/src/wp-includes/class-wp-customize-manager.php

Timestamp:

01/30/2018 03:23:39 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Customize: Ensure heartbeat keeps changeset locked when in branching mode.

Props dlh.
See #42024.
Merges [42612] to the 4.9 branch.
Fixes #42658.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-customize-manager.php (modified) (2 diffs)

branches/4.9/src/wp-includes/class-wp-customize-manager.php

@@ -3171 +3171 @@
          */
         public function check_changeset_lock_with_heartbeat( $response, $data, $screen_id ) {
-                if ( array_key_exists( 'check_changeset_lock', $data ) && 'customize' === $screen_id && current_user_can( 'customize' ) && $this->changeset_post_id() ) {
-                        $lock_user_id = wp_check_post_lock( $this->changeset_post_id() );
+                if ( isset( $data['changeset_uuid'] ) ) {
+                        $changeset_post_id = $this->find_changeset_post_id( $data['changeset_uuid'] );
+                } else {
+                        $changeset_post_id = $this->changeset_post_id();
+                }
+
+                if (
+                        array_key_exists( 'check_changeset_lock', $data )
+                        && 'customize' === $screen_id
+                        && $changeset_post_id
+                        && current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post_id )
+                ) {
+                        $lock_user_id = wp_check_post_lock( $changeset_post_id );
 
                         if ( $lock_user_id ) {
@@ -3179 +3190 @@
 
                                 // Refreshing time will ensure that the user is sitting on customizer and has not closed the customizer tab.
-                                $this->refresh_changeset_lock( $this->changeset_post_id() );
+                                $this->refresh_changeset_lock( $changeset_post_id );
                         }
                 }