Customizer: Prevent saving orphaned settings after plugin deactivation. See #64231.

Alessandro Lioce · Alessandro Lioce · commit 6ccb9c4ff27d · 2025-11-11T14:23:29.000+01:00
diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php
@@ -1772,7 +1772,13 @@ public function unsanitized_post_values( $args = array() ) {
 			$stashed_theme_mods = get_option( 'customize_stashed_theme_mods' );
 			$stylesheet         = $this->get_stylesheet();
 			if ( isset( $stashed_theme_mods[ $stylesheet ] ) ) {
-				$values = array_merge( $values, wp_list_pluck( $stashed_theme_mods[ $stylesheet ], 'value' ) );
+				$stashed_values = wp_list_pluck( $stashed_theme_mods[ $stylesheet ], 'value' );
+
+				$valid_stashed_values = array_filter( $stashed_values, function ( $setting_id ) {
+					return $this->get_setting( $setting_id );
+				}, ARRAY_FILTER_USE_KEY );
+
+				$values = array_merge( $values, $valid_stashed_values );
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1772,7 +1772,13 @@ public function unsanitized_post_values( $args = array() ) {`
`1772`	`1772`	`$stashed_theme_mods = get_option( 'customize_stashed_theme_mods' );`
`1773`	`1773`	`$stylesheet = $this->get_stylesheet();`
`1774`	`1774`	`if ( isset( $stashed_theme_mods[ $stylesheet ] ) ) {`
`1775`		`- $values = array_merge( $values, wp_list_pluck( $stashed_theme_mods[ $stylesheet ], 'value' ) );`
	`1775`	`+ $stashed_values = wp_list_pluck( $stashed_theme_mods[ $stylesheet ], 'value' );`
	`1776`	`+`
	`1777`	`+ $valid_stashed_values = array_filter( $stashed_values, function ( $setting_id ) {`
	`1778`	`+ return $this->get_setting( $setting_id );`
	`1779`	`+ }, ARRAY_FILTER_USE_KEY );`
	`1780`	`+`
	`1781`	`+ $values = array_merge( $values, $valid_stashed_values );`
`1776`	`1782`	`}`
`1777`	`1783`	`}`
`1778`	`1784`