Ticket #42395: 42395.diff

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

@@ -1175 +1175 @@
 
                 $changeset_data = array();
                 if ( $this->changeset_post_id() ) {
+                        /*
+                         * Don't re-import starter content into a previously saved changeset.
+                         *
+                         * When theme switches can be drafted or scheduled, this condition
+                         * might also need to check whether the theme is active or "pending."
+                         */
+                        if ( ( 'auto-draft' !== get_post_status( $this->changeset_post_id() ) ) && $this->is_theme_active() ) {
+                                return;
+                        }
+
                         $changeset_data = $this->get_changeset_post_data( $this->changeset_post_id() );
                 }