Ticket #31484: 31484.2.diff

src/wp-admin/customize.php

@@ -252 +252 @@
                 $settings['settings'][ $id ] = array(
                         'value'     => $setting->js_value(),
                         'transport' => $setting->transport,
+                        'dirty'     => $setting->dirty,
                 );
         }
 

src/wp-admin/js/customize-controls.js

@@ -17 +17 @@
 
                         this.id = id;
                         this.transport = this.transport || 'refresh';
+                        this._dirty = options.dirty || false;
 
                         this.bind( this.preview );
                 },
@@ -2424 +2425 @@
                 $.each( api.settings.settings, function( id, data ) {
                         api.create( id, id, data.value, {
                                 transport: data.transport,
-                                previewer: api.previewer
+                                previewer: api.previewer,
+                                dirty: !! data.dirty
                         } );
                 });
 

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

@@ -60 +60 @@
         public $sanitize_callback    = '';
         public $sanitize_js_callback = '';
 
+        /**
+         * Whether or not the setting is initially dirty when created.
+         *
+         * This is used to ensure that a setting will be sent from the pane to the
+         * preview when loading the Customizer. Normally a setting only is synced to
+         * the preview if it has been changed. This allows the setting to be sent
+         * from the start.
+         *
+         * @since 4.1.2
+         * @access public
+         * @var bool
+         */
+        public $dirty = false;
+
         protected $id_data = array();
 
         /**

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

@@ -216 +216 @@
                 $sidebars_widgets = $this->old_sidebars_widgets;
                 $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()
         }
 
         /**
@@ -232 +233 @@
          * @access public
          *
          * @param array $old_sidebars_widgets
+         * @return array
          */
         public function filter_customize_value_old_sidebars_widgets_data( $old_sidebars_widgets ) {
                 return $this->old_sidebars_widgets;
@@ -249 +251 @@
          * @access public
          *
          * @param array $sidebars_widgets
+         * @return array
          */
         public function filter_option_sidebars_widgets_for_theme_switch( $sidebars_widgets ) {
                 $sidebars_widgets = $GLOBALS['sidebars_widgets'];
@@ -332 +335 @@
                         $setting_id = 'old_sidebars_widgets_data';
                         $setting_args = $this->get_setting_args( $setting_id, array(
                                 'type' => 'global_variable',
+                                'dirty' => true,
                         ) );
                         $this->manager->add_setting( $setting_id, $setting_args );
                 }
@@ -356 +360 @@
                                 $setting_id   = sprintf( 'sidebars_widgets[%s]', $sidebar_id );
                                 $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 );
                                 }
                                 $new_setting_ids[] = $setting_id;
@@ -894 +901 @@
          * @access public
          *
          * @param array $sidebars_widgets List of widgets for the current sidebar.
+         * @return array
          */
         public function preview_sidebars_widgets( $sidebars_widgets ) {
                 $sidebars_widgets = get_option( 'sidebars_widgets' );

tests/phpunit/tests/customize/setting.php

@@ -44 +44 @@
                 $this->assertEquals( '', $setting->sanitize_js_callback );
                 $this->assertFalse( has_filter( "customize_sanitize_{$setting->id}" ) );
                 $this->assertFalse( has_filter( "customize_sanitize_js_{$setting->id}" ) );
+                $this->assertEquals( false, $setting->dirty );
         }
 
         function test_constructor_with_args() {