From 289db2d37b4dc5e92bb8e4cb679d84dc292f0f79 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Mon, 30 Mar 2015 19:22:26 +0000
Subject: [PATCH] Customizer: Revert [31911]. We want to preserve `url` and
 `return` URL parameters to make the experience smoother.

see #31782.
Built from https://develop.svn.wordpress.org/trunk@31933


git-svn-id: http://core.svn.wordpress.org/trunk@31912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/theme.php                | 2 +-
 wp-includes/class-wp-customize-control.php | 2 +-
 wp-includes/version.php                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 3ab1732ca2..2427bb400d 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -532,7 +532,7 @@ function customize_themes_print_templates() {
 			<div class="theme-actions">
 				<# if ( ! data.active ) { #>
 					<div class="inactive-theme">
-						<a href="<?php echo add_query_arg( 'theme', '{{ data.id }}', remove_query_arg( 'theme' ) ); ?>" target="_top" class="button button-primary"><?php _e( 'Live Preview' ); ?></a>
+						<a href="<?php echo add_query_arg( 'theme', '{{ data.id }}' ); ?>" target="_top" class="button button-primary"><?php _e( 'Live Preview' ); ?></a>
 					</div>
 				<# } #>
 			</div>
diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index 5f8b1c3f61..46ce984586 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -1225,7 +1225,7 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
 
 			<# if ( ! data.theme.active ) { #>
 				<div class="theme-actions">
-					<a class="button" href="{{ data.theme.actions.customize }}" target="_top"><?php _e( 'Live Preview' ); ?></a>
+					<a class="button" href="<?php echo add_query_arg( 'theme', '{{ data.theme.id }}' ); ?>" target="_top"><?php _e( 'Live Preview' ); ?></a>
 				</div>
 			<# } #>
 		</div>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0a7d14e2d5..3ddcf70855 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta3-31932';
+$wp_version = '4.2-beta3-31933';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.