Ticket #42415: 42415.0.diff

src/wp-admin/js/customize-controls.js

@@ -8034 +8034 @@
                         };
 
                         // Show changeset UUID in URL when in branching mode and there is a saved changeset.
-                        if ( api.settings.changeset.branching ) {
-                                changesetStatus.bind( function( newStatus ) {
-                                        populateChangesetUuidParam( '' !== newStatus && 'publish' !== newStatus && 'trash' !== newStatus );
-                                } );
-                        }
+                        changesetStatus.bind( function( newStatus ) {
+                                var shouldInclude = '' !== newStatus && 'publish' !== newStatus && 'trash' !== newStatus;
+                                if ( api.settings.changeset.branching ) {
+                                        populateChangesetUuidParam( shouldInclude );
+                                } else if ( ! shouldInclude ) {
+                                        populateChangesetUuidParam( false ); // Only remove UUID if not in branching mode.
+                                }
+
+                        } );
                 }( api.state ) );
 
                 /**