Changeset 31705 for trunk/src/wp-includes/class-wp-customize-widgets.php

Timestamp:

03/10/2015 10:38:30 PM (11 years ago)

Author:

ocean90

Message:

Customizer: Fix previewing and applying widgets when previewing another theme.

• Unset wp_get_sidebars_widgets()' non-admin cache var $_wp_sidebars_widgets in Customize theme preview.
• Add WP_Customize_Setting::$dirty so that settings can be initially-dirty when the Customizer loads.
• Mark old_sidebars_widgets_data setting initially-dirty.
• Mark all sidebars_widgets settings as initially-dirty during theme switch.

props westonruter.
see #31484.

File:

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

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

@@ -217 +217 @@
         $sidebars_widgets = retrieve_widgets( 'customize' );
         add_filter( 'option_sidebars_widgets', array( $this, 'filter_option_sidebars_widgets_for_theme_switch' ), 1 );
+        unset( $GLOBALS['_wp_sidebars_widgets'] ); // reset global cache var used by wp_get_sidebars_widgets()
     }
 
@@ -333 +334 @@
             $setting_args = $this->get_setting_args( $setting_id, array(
                 'type' => 'global_variable',
+                'dirty' => true,
             ) );
             $this->manager->add_setting( $setting_id, $setting_args );
@@ -357 +359 @@
                 $setting_args = $this->get_setting_args( $setting_id );
                 if ( ! $this->manager->get_setting( $setting_id ) ) {
+                    if ( ! $this->manager->is_theme_active() ) {
+                        $setting_args['dirty'] = true;
+                    }
                     $this->manager->add_setting( $setting_id, $setting_args );
                 }