Ticket #38865: 38865.0.diff

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

@@ -2010 +2010 @@
                  * previous saved settings and overriding the associated user_id if they made no change.
                  */
                 $changed_setting_ids = array();
+                $unchanged_incoming_setting_ids = array();
                 foreach ( $post_values as $setting_id => $setting_value ) {
                         $setting = $this->get_setting( $setting_id );
 
@@ -2028 +2029 @@
                         );
                         if ( $is_value_changed ) {
                                 $changed_setting_ids[] = $setting_id;
+                        } else {
+                                $is_unchanged_incoming_value = (
+                                        isset( $args['data'][ $prefixed_setting_id ] )
+                                        &&
+                                        array_key_exists( 'value', $args['data'][ $prefixed_setting_id ] )
+                                        &&
+                                        $args['data'][ $prefixed_setting_id ]['value'] === $setting_value
+                                );
+                                if ( $is_unchanged_incoming_value ) {
+                                        $unchanged_incoming_setting_ids[] = $setting_id;
+                                }
                         }
                 }
                 $post_values = wp_array_slice_assoc( $post_values, $changed_setting_ids );
@@ -2064 +2076 @@
                         return new WP_Error( 'transaction_fail', '', $response );
                 }
 
+                // Ensure that any unchanged settings that were passed in among the data are marked as valid.
+                $setting_validities = array_merge(
+                        array_fill_keys( $unchanged_incoming_setting_ids, true ),
+                        $setting_validities
+                );
+
                 $response = array(
                         'setting_validities' => $setting_validities,
                 );