Changeset 31410 for branches/4.1/src/wp-includes/class-wp-customize-setting.php

Timestamp:

02/11/2015 06:24:01 AM (12 years ago)

Author:

dd32

Message:

Ensure that WP_Customize_Setting::value() returns default value for setting if not dirty.

There was regression introduced by #28580 where only changed (dirty) settings now are POST'ed to the Customizer preview.

• Allow WP_Customize_Manager::post_value() to accept a second $default argument.
• Introduce WP_Customize_Manager::unsanitized_post_values() for accessing previously-private member variable _post_values.
• Do require_once instead of require for Customizer classes.
• Add unit tests for WP_Customize_Manager and WP_Customize_Setting.

Props westonruter, boonebgorges.
Merges [31329] [31339] [31342] [31360] to the 4.1 branch.
Fixes #30988.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-customize-setting.php (modified) (4 diffs)

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

@@ -104 +104 @@
         }
 
+        protected $_original_value;
+
         /**
          * Handle previewing the setting.
@@ -110 +112 @@
          */
         public function preview() {
+                if ( ! isset( $this->_original_value ) ) {
+                        $this->_original_value = $this->value();
+                }
+
                 switch( $this->type ) {
                         case 'theme_mod' :
@@ -160 +166 @@
          */
         public function _preview_filter( $original ) {
-                return $this->multidimensional_replace( $original, $this->id_data[ 'keys' ], $this->post_value() );
+                $undefined = new stdClass(); // symbol hack
+                $post_value = $this->manager->post_value( $this, $undefined );
+                if ( $undefined === $post_value ) {
+                        $value = $this->_original_value;
+                } else {
+                        $value = $post_value;
+                }
+
+                return $this->multidimensional_replace( $original, $this->id_data['keys'], $value );
         }
 
@@ -426 +440 @@
                 }
 
-                if ( $create && ! isset( $node[ $last ] ) )
-                        $node[ $last ] = array();
+                if ( $create ) {
+                        if ( ! is_array( $node ) ) {
+                                // account for an array overriding a string or object value
+                                $node = array();
+                        }
+                        if ( ! isset( $node[ $last ] ) ) {
+                                $node[ $last ] = array();
+                        }
+                }
 
                 if ( ! isset( $node[ $last ] ) )