From 0a600440f2fb87d492ffdcb4f8cedbed2ffc967b Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 29 Apr 2020 17:28:10 +0000 Subject: [PATCH] Docs: Correct `@since` versions, remove duplicate comment. Coding Standards: Fix WPCS issues in `tests/formatting/SanitizeFileName.php`. Follow-up to [47633], [47638]. Merges [47663], [47664] to the 5.4 branch. Built from https://develop.svn.wordpress.org/branches/5.4@47665 git-svn-id: http://core.svn.wordpress.org/branches/5.4@47442 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-customize-manager.php | 6 ------ wp-includes/version.php | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php index 80c177c8d9..b06d46f36c 100644 --- a/wp-includes/class-wp-customize-manager.php +++ b/wp-includes/class-wp-customize-manager.php @@ -2922,12 +2922,6 @@ final class WP_Customize_Manager { $this->store_changeset_revision = $allow_revision; add_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ), 5, 3 ); - /* - * Update the changeset post. The publish_customize_changeset action - * will cause the settings in the changeset to be saved via - * WP_Customize_Setting::save(). - */ - /* * Update the changeset post. The publish_customize_changeset action will cause the settings in the * changeset to be saved via WP_Customize_Setting::save(). Updating a post with publish status will diff --git a/wp-includes/version.php b/wp-includes/version.php index a6a8b5c086..35938b102c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4.1-RC1-47643'; +$wp_version = '5.4.1-RC1-47665'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.