Changeset 19434

Timestamp:

11/23/2011 11:01:20 PM (13 years ago)

Author:

nacin

Message:

Use an 'appearance' group in the admin bar. fixes #19245.

Location:

trunk/wp-includes

Files:

• admin-bar.php (modified) (2 diffs)
• class-wp-admin-bar.php (modified) (1 diff)

trunk/wp-includes/admin-bar.php

@@ -539 +539 @@
  */
 function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
+    $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' => 'site-name', 'id' => 'themes', 'title' => __('Themes'), 'href' => admin_url('themes.php') ) );
+        $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'themes', 'title' => __('Themes'), 'href' => admin_url('themes.php') ) );
 
     if ( ! current_user_can( 'edit_theme_options' ) )
@@ -546 +548 @@
 
     if ( current_theme_supports( 'widgets' )  )
-        $wp_admin_bar->add_menu( array( 'parent' => 'site-name', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) );
+        $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) );
 
      if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
-        $wp_admin_bar->add_menu( array( 'parent' => 'site-name', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
+        $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
 
     if ( current_theme_supports( 'custom-background' ) )
-        $wp_admin_bar->add_menu( array( 'parent' => 'site-name', 'id' => 'background', 'title' => __('Background'), 'href' => admin_url('themes.php?page=custom-background') ) );
+        $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'background', 'title' => __('Background'), 'href' => admin_url('themes.php?page=custom-background') ) );
 
     if ( current_theme_supports( 'custom-header' ) )
-        $wp_admin_bar->add_menu( array( 'parent' => 'site-name', 'id' => 'header', 'title' => __('Header'), 'href' => admin_url('themes.php?page=custom-header') ) );
+        $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'header', 'title' => __('Header'), 'href' => admin_url('themes.php?page=custom-header') ) );
 }
 

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

@@ -127 +127 @@
         global $is_IE, $is_iphone;
 
-        $back_compat_parents = array(
-            'appearance' => 'site-name',
-        );
-
         // Link nodes to parents.
         foreach ( $this->nodes as $node ) {
-
-            if ( isset( $back_compat_parents[ $node->parent ] ) )
-                $node->parent = $back_compat_parents[ $node->parent ];
 
             // Handle root menu items