IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Customize: Ensure changeset_uuid param for autosave auto-draft gets stripped from location after previewing theme switch when not in branching mode.

Browse Source 
Amends [41597].
See #39896.
Fixes #42415.

Built from https://develop.svn.wordpress.org/trunk@42114


git-svn-id: http://core.svn.wordpress.org/trunk@41943 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2017-11-03 17:37:52 +00:00
parent d0608c5585
commit 76e01c3562
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/js/customize-controls.js
View File

@ -8248,6 +8248,7 @@
// Set up initial notifications. // Set up initial notifications.
(function() { (function() {
var removedQueryParams = [];
/** /**
* Obtain the URL to restore the autosave. * Obtain the URL to restore the autosave.
@ -8344,9 +8345,13 @@
if ( api.settings.changeset.autosaved ) { if ( api.settings.changeset.autosaved ) {
api.state( 'saved' ).set( false ); api.state( 'saved' ).set( false );
stripParamsFromLocation( [ 'customize_autosaved' ] ); // Remove param when restoring autosave revision. removedQueryParams.push( 'customize_autosaved' );
} else if ( ! api.settings.changeset.branching && 'auto-draft' === api.settings.changeset.status ) { }
stripParamsFromLocation( [ 'changeset_uuid' ] ); // Remove UUID when restoring autosave auto-draft. if ( ! api.settings.changeset.branching && ( ! api.settings.changeset.status || 'auto-draft' === api.settings.changeset.status ) ) {
removedQueryParams.push( 'changeset_uuid' ); // Remove UUID when restoring autosave auto-draft.
}
if ( removedQueryParams.length > 0 ) {
stripParamsFromLocation( removedQueryParams );
} }
if ( api.settings.changeset.latestAutoDraftUuid || api.settings.changeset.hasAutosaveRevision ) { if ( api.settings.changeset.latestAutoDraftUuid || api.settings.changeset.hasAutosaveRevision ) {
addAutosaveRestoreNotification(); addAutosaveRestoreNotification();

2
wp-admin/js/customize-controls.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-RC1-42113'; $wp_version = '4.9-RC1-42114';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.