From 46f0cfe3caf4b829d9d76a638164113cd0391952 Mon Sep 17 00:00:00 2001 From: desrosj Date: Tue, 13 Jul 2021 18:02:57 +0000 Subject: [PATCH] Coding Standards: Use the correct formatting for multi-line comments. Follow up to [51414]. Built from https://develop.svn.wordpress.org/trunk@51423 git-svn-id: http://core.svn.wordpress.org/trunk@51034 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/blocks/legacy-widget.php | 7 +++++++ wp-includes/class-wp-customize-widgets.php | 8 +++++--- wp-includes/version.php | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/wp-includes/blocks/legacy-widget.php b/wp-includes/blocks/legacy-widget.php index 8a32605681..e827f8f7c5 100644 --- a/wp-includes/blocks/legacy-widget.php +++ b/wp-includes/blocks/legacy-widget.php @@ -29,6 +29,13 @@ function render_block_core_legacy_widget( $attributes ) { $widget_key = $wp_widget_factory->get_widget_key( $id_base ); $widget_object = $wp_widget_factory->get_widget_object( $id_base ); } else { + /* + * This file is copied from the published @wordpress/widgets package when WordPress + * Core is built. Because the package is a dependency of both WordPress Core and the + * Gutenberg plugin where the block editor is developed, this fallback condition is + * required until the minimum required version of WordPress for the plugin is raised + * to 5.8. + */ $widget_key = gutenberg_get_widget_key( $id_base ); $widget_object = gutenberg_get_widget_object( $id_base ); } diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php index d5cae766b9..9df026d5b2 100644 --- a/wp-includes/class-wp-customize-widgets.php +++ b/wp-includes/class-wp-customize-widgets.php @@ -1420,9 +1420,11 @@ final class WP_Customize_Widgets { $widget_object = $wp_widget_factory->get_widget_object( $id_base ); if ( ! empty( $widget_object->widget_options['show_instance_in_rest'] ) ) { if ( 'block' === $id_base && ! current_user_can( 'unfiltered_html' ) ) { - // The content of the 'block' widget is not filtered on the - // fly while editing. Filter the content here to prevent - // vulnerabilities. + /* + * The content of the 'block' widget is not filtered on the + * fly while editing. Filter the content here to prevent + * vulnerabilities. + */ $value['raw_instance']['content'] = wp_kses_post( $value['raw_instance']['content'] ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 5f6b631af6..58e9548bfe 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.9-alpha-51421'; +$wp_version = '5.9-alpha-51423'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.