Ticket #36389: 36389.1.diff

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

@@ -99 +99 @@
                 }
 
                 add_filter( 'customize_dynamic_setting_args',          array( $this, 'filter_customize_dynamic_setting_args' ), 10, 2 );
-                add_action( 'after_setup_theme',                       array( $this, 'register_settings' ) );
+                add_action( 'widgets_init',                            array( $this, 'register_settings' ), 95 );
                 add_action( 'wp_loaded',                               array( $this, 'override_sidebars_widgets_for_theme_switch' ) );
                 add_action( 'customize_controls_init',                 array( $this, 'customize_controls_init' ) );
                 add_action( 'customize_register',                      array( $this, 'schedule_customize_register' ), 1 );
@@ -376 +376 @@
         public function customize_register() {
                 global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_sidebars;
 
+                add_filter( 'sidebars_widgets', array( $this, 'preview_sidebars_widgets' ), 1 );
+
                 $sidebars_widgets = array_merge(
                         array( 'wp_inactive_widgets' => array() ),
                         array_fill_keys( array_keys( $wp_registered_sidebars ), array() ),
@@ -509 +511 @@
                                 $this->manager->get_setting( $new_setting_id )->preview();
                         }
                 }
-
-                add_filter( 'sidebars_widgets', array( $this, 'preview_sidebars_widgets' ), 1 );
         }
 
         /**

tests/phpunit/tests/customize/widgets.php

@@ -70 +70 @@
 
         function set_customized_post_data( $customized ) {
                 $_POST['customized'] = wp_slash( wp_json_encode( $customized ) );
+                if ( $this->manager ) {
+                        foreach ( $customized as $id => $value ) {
+                                $this->manager->set_post_value( $id, $value );
+                        }
+                }
         }
 
         function do_customize_boot_actions() {