Ticket #33499: 33499.3.diff

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

@@ -144 +144 @@
                         // Other setting types can opt-in to aggregate multidimensional explicitly.
                         $this->aggregate_multidimensional();
                 }
+
+                // Allow option settings to indicate whether they should be autoloaded.
+                if ( 'option' === $this->type ) {
+                        $autoload = true;
+                        if ( isset( $args['autoload'] ) ) {
+                                $autoload = $args['autoload'];
+                        }
+                        // @todo issue warning if already set and not equal to $autoload?
+                        self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'] = $autoload;
+                }
         }
 
         /**
@@ -502 +512 @@
         protected function set_root_value( $value ) {
                 $id_base = $this->id_data['base'];
                 if ( 'option' === $this->type ) {
-                        return update_option( $id_base, $value );
+                        return update_option( $id_base, $value, self::$aggregated_multidimensionals[ $this->type ][ $this->id_data['base'] ]['autoload'] );
                 } else if ( 'theme_mod' ) {
                         set_theme_mod( $id_base, $value );
                         return true;