Changeset 37982

Timestamp:

07/06/2016 05:58:28 AM (9 years ago)

Author:

westonruter

Message:

Customize: Ensure that WP_Customize_Setting::value() can return a previewed value for aggregated multidimensionals.

Fixes #37294.

Location:

trunk

Files:

• src/wp-includes/class-wp-customize-setting.php (modified) (1 diff)
• tests/phpunit/tests/customize/setting.php (modified) (1 diff)

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

@@ -712 +712 @@
             $root_value = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
             $value = $this->multidimensional_get( $root_value, $this->id_data['keys'], $this->default );
+
+            // Ensure that the post value is used if the setting is previewed, since preview filters aren't applying on cached $root_value.
+            if ( $this->is_previewed ) {
+                $value = $this->post_value( $value );
+            }
         } else {
             $value = $this->get_root_value( $this->default );

trunk/tests/phpunit/tests/customize/setting.php

@@ -641 +641 @@
         return $validity;
     }
+
+    /**
+     * Ensure that WP_Customize_Setting::value() can return a previewed value for aggregated multidimensionals.
+     *
+     * @ticket 37294
+     */
+    public function test_multidimensional_value_when_previewed() {
+        WP_Customize_Setting::reset_aggregated_multidimensionals();
+
+        $initial_value = 456;
+        set_theme_mod( 'nav_menu_locations', array(
+            'primary' => $initial_value,
+        ) );
+        $setting_id = 'nav_menu_locations[primary]';
+
+        $setting = new WP_Customize_Setting( $this->manager, $setting_id );
+        $this->assertEquals( $initial_value, $setting->value() );
+
+        $override_value = -123456;
+        $this->manager->set_post_value( $setting_id, $override_value );
+        $setting->preview();
+
+        $this->assertEquals( $override_value, $setting->value() );
+    }
 }