From d8a052388781e6893cb04f59a09102bbe1a231ff Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 19 Aug 2019 04:04:52 +0000 Subject: [PATCH] Editor: Fix undefined `$locked` var in edit-form-blocks.php when the `show_post_locked_dialog` filter is used to disable displaying of the dialog. Props aprea. Merges [45564] to the 5.2 branch. Fixes #47604. Built from https://develop.svn.wordpress.org/branches/5.2@45831 git-svn-id: http://core.svn.wordpress.org/branches/5.2@45642 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-form-blocks.php | 2 ++ wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-admin/edit-form-blocks.php b/wp-admin/edit-form-blocks.php index 774501cb54..4f68a8a4f1 100644 --- a/wp-admin/edit-form-blocks.php +++ b/wp-admin/edit-form-blocks.php @@ -226,6 +226,8 @@ foreach ( $image_size_names as $image_size_slug => $image_size_name ) { // Lock settings. $user_id = wp_check_post_lock( $post->ID ); if ( $user_id ) { + $locked = false; + /** This filter is documented in wp-admin/includes/post.php */ if ( apply_filters( 'show_post_locked_dialog', true, $post, $user_id ) ) { $locked = true; diff --git a/wp-includes/version.php b/wp-includes/version.php index e27b4c0246..9db3644773 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.2.3-alpha-45830'; +$wp_version = '5.2.3-alpha-45831'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.