From d93636bd11599f71aad088edf370d4bd599e91ce Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Mon, 24 Oct 2016 18:17:39 +0000
Subject: [PATCH] Customize: Disable theme installation in multisite.

Props celloexpressions, iamfriendly.
Fixes #38370.

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


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

diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 23a65f127f..5a7cd46421 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -3026,54 +3026,56 @@ final class WP_Customize_Manager {
 			'priority'    => 0,
 		) ) );
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'search_themes', array(
-			'title'       => __( 'Search themes&hellip;' ),
-			'text_before' => __( 'Browse all WordPress.org themes' ),
-			'action'      => 'search',
-			'capability'  => 'install_themes',
-			'panel'       => 'themes',
-			'priority'    => 5,
-		) ) );
+		if ( ! is_multisite() ) {
+			$this->add_section( new WP_Customize_Themes_Section( $this, 'search_themes', array(
+				'title'       => __( 'Search themes&hellip;' ),
+				'text_before' => __( 'Browse all WordPress.org themes' ),
+				'action'      => 'search',
+				'capability'  => 'install_themes',
+				'panel'       => 'themes',
+				'priority'    => 5,
+			) ) );
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'featured_themes', array(
-			'title'      => __( 'Featured' ),
-			'action'     => 'featured',
-			'capability' => 'install_themes',
-			'panel'      => 'themes',
-			'priority'   => 10,
-		) ) );
+			$this->add_section( new WP_Customize_Themes_Section( $this, 'featured_themes', array(
+				'title'      => __( 'Featured' ),
+				'action'     => 'featured',
+				'capability' => 'install_themes',
+				'panel'      => 'themes',
+				'priority'   => 10,
+			) ) );
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'popular_themes', array(
-			'title'      => __( 'Popular' ),
-			'action'     => 'popular',
-			'capability' => 'install_themes',
-			'panel'      => 'themes',
-			'priority'   => 15,
-		) ) );
+			$this->add_section( new WP_Customize_Themes_Section( $this, 'popular_themes', array(
+				'title'      => __( 'Popular' ),
+				'action'     => 'popular',
+				'capability' => 'install_themes',
+				'panel'      => 'themes',
+				'priority'   => 15,
+			) ) );
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'latest_themes', array(
-			'title'      => __( 'Latest' ),
-			'action'     => 'latest',
-			'capability' => 'install_themes',
-			'panel'      => 'themes',
-			'priority'   => 20,
-		) ) );
+			$this->add_section( new WP_Customize_Themes_Section( $this, 'latest_themes', array(
+				'title'      => __( 'Latest' ),
+				'action'     => 'latest',
+				'capability' => 'install_themes',
+				'panel'      => 'themes',
+				'priority'   => 20,
+			) ) );
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'feature_filter_themes', array(
-			'title'      => __( 'Feature Filter' ),
-			'action'     => 'feature_filter',
-			'capability' => 'install_themes',
-			'panel'      => 'themes',
-			'priority'   => 25,
-		) ) );
+			$this->add_section( new WP_Customize_Themes_Section( $this, 'feature_filter_themes', array(
+				'title'      => __( 'Feature Filter' ),
+				'action'     => 'feature_filter',
+				'capability' => 'install_themes',
+				'panel'      => 'themes',
+				'priority'   => 25,
+			) ) );
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'favorites_themes', array(
-			'title'      => __( 'Favorites' ),
-			'action'     => 'favorites',
-			'capability' => 'install_themes',
-			'panel'      => 'themes',
-			'priority'   => 30,
-		) ) );
+			$this->add_section( new WP_Customize_Themes_Section( $this, 'favorites_themes', array(
+				'title'      => __( 'Favorites' ),
+				'action'     => 'favorites',
+				'capability' => 'install_themes',
+				'panel'      => 'themes',
+				'priority'   => 30,
+			) ) );
+		}
 
 		// Themes Setting (unused - the theme is considerably more fundamental to the Customizer experience).
 		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'active_theme', array(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b28ed08ed8..61623d406a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38886';
+$wp_version = '4.7-alpha-38887';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.