Ticket #40146: 40146.diff

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

@@ -1419 +1419 @@
                         }
                 }
 
+                $current_theme_supports_starter_content = current_theme_supports( 'starter-content' );
+
                 if ( ! $args['exclude_changeset'] ) {
                         foreach ( $this->changeset_data() as $setting_id => $setting_params ) {
                                 if ( ! array_key_exists( 'value', $setting_params ) ) {
                                         continue;
                                 }
+                                if ( ! empty( $setting_params['starter_content'] ) && ! $current_theme_supports_starter_content ) {
+                                        continue;
+                                }
                                 if ( isset( $setting_params['type'] ) && 'theme_mod' === $setting_params['type'] ) {
 
                                         // Ensure that theme mods values are only used if they were saved under the current theme.