Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Customize: Prevent frontend previewing from causing a customization lock on the changeset. 

Props dlh.
Amends [41839].
See #42024.
Fixes #42975.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2018-01-22 06:49:31 +00:00
parent 0e94d99f64
commit 183cda343a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/class-wp-customize-manager.php
View File

@ -607,8 +607,11 @@ final class WP_Customize_Manager {
* enabled, then a new UUID will be generated.
*
* @since 4.9.0
* @global string $pagenow
*/
public function establish_loaded_changeset() {
global $pagenow;
if ( empty( $this->_changeset_uuid ) ) {
$changeset_uuid = null;
@ -637,7 +640,9 @@ final class WP_Customize_Manager {
$this->_changeset_uuid = $changeset_uuid;
}
$this->set_changeset_lock( $this->changeset_post_id() );
if ( is_admin() && 'customize.php' === $pagenow ) {
$this->set_changeset_lock( $this->changeset_post_id() );
}
}
/**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.0-alpha-42540';
$wp_version = '5.0-alpha-42541';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.