Ticket #39087: 39087.experiment.diff

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

@@ -115 +115 @@
 
                 add_action( 'dynamic_sidebar',                         array( $this, 'tally_rendered_widgets' ) );
                 add_filter( 'is_active_sidebar',                       array( $this, 'tally_sidebars_via_is_active_sidebar_calls' ), 10, 2 );
+                add_filter( 'body_class',                              array( $this, 'flag_did_filter_body_classes' ), 1000 );
                 add_filter( 'dynamic_sidebar_has_widgets',             array( $this, 'tally_sidebars_via_dynamic_sidebar_calls' ), 10, 2 );
 
                 // Selective Refresh.
@@ -122 +123 @@
                 add_action( 'customize_preview_init',                  array( $this, 'selective_refresh_init' ) );
         }
 
+        protected $did_filter_body_classes = false;
+
+        /**
+         * Capture the "action" for when the body classes have already been computed and thus the last time that is_active_sidebar is likely to be called until dynamic_sidebar() calls.
+         *
+         * @param array $classes Body classes.
+         * @return array Body classes/
+         */
+        function flag_did_filter_body_classes( $classes ) {
+                $this->did_filter_body_classes = true;
+                return $classes;
+        }
+
         /**
          * List whether each registered widget can be use selective refresh.
          *
@@ -1203 +1217 @@
          * @return bool Whether the sidebar is active.
          */
         public function tally_sidebars_via_is_active_sidebar_calls( $is_active, $sidebar_id ) {
-                if ( is_registered_sidebar( $sidebar_id ) ) {
+                if ( $this->did_filter_body_classes && is_registered_sidebar( $sidebar_id ) ) {
                         $this->rendered_sidebars[] = $sidebar_id;
                 }
                 /*