Changeset 31950

Timestamp:

04/01/2015 11:34:23 AM (9 years ago)

Author:

ocean90

Message:

Customizer Theme Switcher: Fix invalid HTML markup when New Theme control is added.

see #31203.

Location:

trunk/src/wp-includes

Files:

• class-wp-customize-control.php (modified) (1 diff)
• class-wp-customize-manager.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-customize-control.php

@@ -1244 +1244 @@
 
     /**
-     * Render the new control.
+     * Render the control content.
      *
      * @since 4.2.0
      */
-    public function render() {
-        if ( is_multisite() || ! current_user_can( 'install_themes') ) {
-            return;
-        }
+    public function render_content() {
         ?>
         <div class="theme add-new-theme">

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -1172 +1172 @@
         }
 
-        $this->add_control( new WP_Customize_New_Theme_Control( $this, 'add_theme', array(
-            'section' => 'themes',
-            'settings' => 'active_theme',
-        ) ) );
+        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 */