Changeset 48299

Timestamp:

07/04/2020 07:33:06 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-includes/class-wp-customize-widgets.php (modified) (6 diffs)

trunk/src/wp-includes/class-wp-customize-widgets.php

@@ -1171 +1171 @@
 
         $switched_locale = switch_to_locale( get_user_locale() );
-        $l10n            = array(
+
+        $l10n = array(
             'widgetTooltip' => __( 'Shift-click to edit this widget.' ),
         );
+
         if ( $switched_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.
         $settings = array(
-            'renderedSidebars'            => array_fill_keys( array_unique( $this->rendered_sidebars ), true ),
-            'renderedWidgets'             => array_fill_keys( array_keys( $this->rendered_widgets ), true ),
+            'renderedSidebars'            => array_fill_keys( array_keys( $rendered_sidebars ), true ),
+            'renderedWidgets'             => array_fill_keys( array_keys( $rendered_widgets ), true ),
             'registeredSidebars'          => array_values( $wp_registered_sidebars ),
             'registeredWidgets'           => $wp_registered_widgets,
@@ -1187 +1192 @@
             'selectiveRefreshableWidgets' => $this->get_selective_refreshable_widgets(),
         );
+
         foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
             unset( $registered_widget['callback'] ); // May not be JSON-serializeable.
@@ -1218 +1224 @@
      */
     public function is_widget_rendered( $widget_id ) {
-        return in_array( $widget_id, $this->rendered_widgets, true );
+        return ! empty( $this->rendered_widgets[ $widget_id ] );
     }
 
@@ -1230 +1236 @@
      */
     public function is_sidebar_rendered( $sidebar_id ) {
-        return in_array( $sidebar_id, $this->rendered_sidebars, true );
+        return ! empty( $this->rendered_sidebars[ $sidebar_id ] );
     }
 
@@ -1248 +1254 @@
     public function tally_sidebars_via_is_active_sidebar_calls( $is_active, $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
@@ -1273 +1280 @@
     public function tally_sidebars_via_dynamic_sidebar_calls( $has_widgets, $sidebar_id ) {
         if ( is_registered_sidebar( $sidebar_id ) ) {
-            $this->rendered_sidebars[] = $sidebar_id;
+            $this->rendered_sidebars[ $sidebar_id ] = true;
         }