Changeset 40036 for trunk

Timestamp:

02/01/2017 01:39:39 AM (8 years ago)

Author:

westonruter

Message:

Customize: Ensure root values are accessible in multidimensional custom setting types.

Fixes bad conditions in WP_Customize_Setting::get_root_value() and WP_Customize_Setting::set_root_value().

Props dlh.
Amends [35007].
See #32103.
Fixes #36952.

Location:

trunk

Files:

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

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

@@ -588 +588 @@
         if ( 'option' === $this->type ) {
             return get_option( $id_base, $default );
-        } else if ( 'theme_mod' ) {
+        } elseif ( 'theme_mod' === $this->type ) {
             return get_theme_mod( $id_base, $default );
         } else {
@@ -617 +617 @@
             }
             return update_option( $id_base, $value, $autoload );
-        } else if ( 'theme_mod' ) {
+        } elseif ( 'theme_mod' === $this->type ) {
             set_theme_mod( $id_base, $value );
             return true;

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

@@ -403 +403 @@
             'sanitize_callback' => array( $this->manager->nav_menus, 'intval_base10' ),
         ) );
+
+        /*
+         * In #36952 the conditions were such that get_theme_mod() be erroneously used
+         * to source the root value for a custom multidimensional type.
+         * Add a theme mod with the same name as the custom setting to test fix.
+         */
+        set_theme_mod( $setting_id, 999 );
         $this->assertSame( 123, $setting->value() );
+
         $this->manager->set_post_value( $setting_id, '456' );
         $setting->preview();
@@ -409 +417 @@
 
         unset( $this->custom_type_data_previewed, $this->custom_type_data_saved );
+        remove_theme_mod( $setting_id );
     }