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

Customize: Correct the check for rendered widgets in `WP_Customize_Widgets::is_widget_rendered()`. 

Make the structure of `::$rendered_sidebars` and `::$rendered_widgets` properties consistent.

This resolves an issue with every widget being marked as inactive by default on the Widgets panel.

Props dlh, afercia, SergeyBiryukov.
Fixes #50508.
Built from https://develop.svn.wordpress.org/trunk@48299


git-svn-id: http://core.svn.wordpress.org/trunk@48068 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-07-04 19:35:01 +00:00
parent d90213bf18
commit e3e45b6428
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-includes/class-wp-customize-widgets.php
View File

@ -1170,22 +1170,28 @@ final class WP_Customize_Widgets {
global $wp_registered_sidebars, $wp_registered_widgets; global $wp_registered_sidebars, $wp_registered_widgets;
$switched_locale = switch_to_locale( get_user_locale() ); $switched_locale = switch_to_locale( get_user_locale() );
$l10n = array(
$l10n = array(
'widgetTooltip' => __( 'Shift-click to edit this widget.' ), 'widgetTooltip' => __( 'Shift-click to edit this widget.' ),
); );
if ( $switched_locale ) { if ( $switched_locale ) {
restore_previous_locale(); restore_previous_locale();
} }
$rendered_sidebars = array_filter( $this->rendered_sidebars );
$rendered_widgets = array_filter( $this->rendered_widgets );
// Prepare Customizer settings to pass to JavaScript. // Prepare Customizer settings to pass to JavaScript.
$settings = array( $settings = array(
'renderedSidebars' => array_fill_keys( array_unique( $this->rendered_sidebars ), true ), 'renderedSidebars' => array_fill_keys( array_keys( $rendered_sidebars ), true ),
'renderedWidgets' => array_fill_keys( array_keys( $this->rendered_widgets ), true ), 'renderedWidgets' => array_fill_keys( array_keys( $rendered_widgets ), true ),
'registeredSidebars' => array_values( $wp_registered_sidebars ), 'registeredSidebars' => array_values( $wp_registered_sidebars ),
'registeredWidgets' => $wp_registered_widgets, 'registeredWidgets' => $wp_registered_widgets,
'l10n' => $l10n, 'l10n' => $l10n,
'selectiveRefreshableWidgets' => $this->get_selective_refreshable_widgets(), 'selectiveRefreshableWidgets' => $this->get_selective_refreshable_widgets(),
); );
foreach ( $settings['registeredWidgets'] as &$registered_widget ) { foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
unset( $registered_widget['callback'] ); // May not be JSON-serializeable. unset( $registered_widget['callback'] ); // May not be JSON-serializeable.
} }
@ -1217,7 +1223,7 @@ final class WP_Customize_Widgets {
* @return bool Whether the widget is rendered. * @return bool Whether the widget is rendered.
*/ */
public function is_widget_rendered( $widget_id ) { public function is_widget_rendered( $widget_id ) {
return in_array( $widget_id, $this->rendered_widgets, true ); return ! empty( $this->rendered_widgets[ $widget_id ] );
} }
/** /**
@ -1229,7 +1235,7 @@ final class WP_Customize_Widgets {
* @return bool Whether the sidebar is rendered. * @return bool Whether the sidebar is rendered.
*/ */
public function is_sidebar_rendered( $sidebar_id ) { public function is_sidebar_rendered( $sidebar_id ) {
return in_array( $sidebar_id, $this->rendered_sidebars, true ); return ! empty( $this->rendered_sidebars[ $sidebar_id ] );
} }
/** /**
@ -1247,8 +1253,9 @@ final class WP_Customize_Widgets {
*/ */
public function tally_sidebars_via_is_active_sidebar_calls( $is_active, $sidebar_id ) { public function tally_sidebars_via_is_active_sidebar_calls( $is_active, $sidebar_id ) {
if ( is_registered_sidebar( $sidebar_id ) ) { if ( is_registered_sidebar( $sidebar_id ) ) {
$this->rendered_sidebars[] = $sidebar_id; $this->rendered_sidebars[ $sidebar_id ] = true;
} }
/* /*
* We may need to force this to true, and also force-true the value * We may need to force this to true, and also force-true the value
* for 'dynamic_sidebar_has_widgets' if we want to ensure that there * for 'dynamic_sidebar_has_widgets' if we want to ensure that there
@ -1272,7 +1279,7 @@ final class WP_Customize_Widgets {
*/ */
public function tally_sidebars_via_dynamic_sidebar_calls( $has_widgets, $sidebar_id ) { public function tally_sidebars_via_dynamic_sidebar_calls( $has_widgets, $sidebar_id ) {
if ( is_registered_sidebar( $sidebar_id ) ) { if ( is_registered_sidebar( $sidebar_id ) ) {
$this->rendered_sidebars[] = $sidebar_id; $this->rendered_sidebars[ $sidebar_id ] = true;
} }
/* /*

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-48298'; $wp_version = '5.5-alpha-48299';
/** /**
* 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.