From 385f70dc966f6f260196ba59738ff3b94313dfbf Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Mon, 22 Jan 2018 06:51:40 +0000
Subject: [PATCH] Customize: Prevent frontend previewing from causing a
 customization lock on the changeset.

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

Built from https://develop.svn.wordpress.org/branches/4.9@42542


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-customize-manager.php | 7 ++++++-
 wp-includes/version.php                    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 2f828a4ef5..6ee4271af2 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -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;
 
@@ -635,7 +638,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() );
+		}
 	}
 
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 825694315b..0667eb56f4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9.3-alpha-42539';
+$wp_version = '4.9.3-alpha-42542';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.