WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
Built from https://develop.svn.wordpress.org/trunk@48211


git-svn-id: http://core.svn.wordpress.org/trunk@47980 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-06-29 10:33:08 +00:00
parent 71244fc29e
commit 5a60d4b3b0
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/admin-bar.php
View File

@ -425,7 +425,9 @@ function wp_admin_bar_customize_menu( $wp_admin_bar ) {
} }
// Don't show if the user cannot edit a given customize_changeset post currently being previewed. // 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; return;
} }

16
wp-includes/class-wp-customize-manager.php
View File

@ -3139,7 +3139,8 @@ final class WP_Customize_Manager {
return; return;
} }
if ( $changeset_post_id && ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->delete_post, $changeset_post_id ) ) { if ( $changeset_post_id ) {
if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->delete_post, $changeset_post_id ) ) {
wp_send_json_error( wp_send_json_error(
array( array(
'code' => 'changeset_trash_unauthorized', 'code' => 'changeset_trash_unauthorized',
@ -3148,6 +3149,19 @@ final class WP_Customize_Manager {
); );
} }
$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 ),
)
);
}
}
if ( 'trash' === get_post_status( $changeset_post_id ) ) { if ( 'trash' === get_post_status( $changeset_post_id ) ) {
wp_send_json_error( wp_send_json_error(
array( array(

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-48210'; $wp_version = '5.5-alpha-48211';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.