From 57fce2e593e1d0ad977024389655a6bd092635e1 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Wed, 1 Apr 2015 19:50:29 +0000
Subject: [PATCH] Customizer Theme Switcher: Remove "Add New" references.

The current iteration takes you out of the customizer context, which isn't great UX and doesn't really fit into the flows targeted by this particular UI.

fixes #31837.
Built from https://develop.svn.wordpress.org/trunk@31968


git-svn-id: http://core.svn.wordpress.org/trunk@31947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-customize-control.php | 28 ----------------------
 wp-includes/class-wp-customize-manager.php |  7 ------
 wp-includes/class-wp-customize-section.php |  3 ---
 wp-includes/version.php                    |  2 +-
 4 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index 0508de0270..a4ead63c0f 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -1234,34 +1234,6 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
 	}
 }
 
-/**
- * Customize New Theme Control class.
- *
- * @since 4.2.0
- *
- * @see WP_Customize_Control
- */
-class WP_Customize_New_Theme_Control extends WP_Customize_Control {
-
-	/**
-	 * Render the control content.
-	 *
-	 * @since 4.2.0
-	 */
-	public function render_content() {
-		?>
-		<div class="theme add-new-theme">
-			<a href="<?php echo admin_url( 'theme-install.php' ); ?>" target="_top">
-				<div class="theme-screenshot">
-					<span></span>
-				</div>
-				<h3 class="theme-name"><?php _e( 'Add New Theme' ); ?></h3>
-			</a>
-		</div>
-		<?php
-	}
-}
-
 /**
  * Widget Area Customize Control class.
  *
diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 4be5622382..4074d05a9a 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -1171,13 +1171,6 @@ final class WP_Customize_Manager {
 			) ) );
 		}
 
-		if ( ! is_multisite() && current_user_can( 'install_themes' ) ) {
-			$this->add_control( new WP_Customize_New_Theme_Control( $this, 'add_theme', array(
-				'section' => 'themes',
-				'settings' => 'active_theme',
-			) ) );
-		}
-
 		/* Site Title & Tagline */
 
 		$this->add_section( 'title_tagline', array(
diff --git a/wp-includes/class-wp-customize-section.php b/wp-includes/class-wp-customize-section.php
index 779f9c6621..1309f245d1 100644
--- a/wp-includes/class-wp-customize-section.php
+++ b/wp-includes/class-wp-customize-section.php
@@ -348,9 +348,6 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 			<div class="customize-themes-panel control-panel-content themes-php">
 				<h2><?php esc_html_e( 'Themes' ); ?>
 					<span class="title-count theme-count"><?php echo count( $this->controls ) - 1; ?></span>
-				<?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
-					<a href="<?php echo admin_url( 'theme-install.php' ); ?>" target="_top" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a>
-				<?php endif; ?>
 				</h2>
 				<div class="theme-overlay" tabindex="0" role="dialog" aria-label="<?php esc_attr_e( 'Theme Details' ); ?>"></div>
 				<div id="customize-container"></div>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cc89bc611f..152de38c50 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta3-31967';
+$wp_version = '4.2-beta3-31968';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.