Changeset 31533 for trunk/src/wp-includes/admin-bar.php

Timestamp:

02/24/2015 08:30:22 PM (10 years ago)

Author:

markjaquith

Message:

Add theme browsing and theme switching to the Customizer

• Brings into core the Customizer Theme Switcher feature plugin
• You can now browse, preview, and activate themes right from the Customizer

fixes #31303.
props celloexpressions, afercia, westonruter, folletto, designsimply

File:

• trunk/src/wp-includes/admin-bar.php (modified) (2 diffs)

trunk/src/wp-includes/admin-bar.php

@@ -651 +651 @@
     $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
 
-    if ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
-        $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'themes', 'title' => __('Themes'), 'href' => admin_url('themes.php') ) );
-
-    if ( ! current_user_can( 'edit_theme_options' ) )
-        return;
-
     $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
     $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() );
+
+    if ( current_user_can( 'switch_themes' ) ) {
+        $wp_admin_bar->add_menu( array(
+            'parent' => 'appearance',
+            'id'     => 'themes',
+            'title'  => __( 'Themes' ),
+            'href'   => admin_url( 'themes.php' ),
+            'meta'   => array(
+                'class' => 'hide-if-customize',
+            ),
+        ) );
+
+        if ( current_user_can( 'customize' ) ) {
+            $wp_admin_bar->add_menu( array(
+                'parent' => 'appearance',
+                'id'     => 'customize-themes',
+                'title'  => __( 'Themes' ),
+                'href'   => add_query_arg( urlencode( 'autofocus[section]' ), 'themes', $customize_url ), // urlencode() needed due to #16859
+                'meta'   => array(
+                    'class' => 'hide-if-no-customize',
+                ),
+            ) );
+        }
+    }
+
     if ( current_user_can( 'customize' ) ) {
         $wp_admin_bar->add_menu( array(
@@ -670 +689 @@
         ) );
         add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
+    }
+
+    if ( ! current_user_can( 'edit_theme_options' ) ) {
+        return;
     }