Ticket #19245: 19245.diff

wp-includes/admin-bar.php

@@ -541 +541 @@
  */
 function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
         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' ) )
                 return;
 
         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') ) );
 }
 
 /**

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

@@ -112 +112 @@
         }
 
         public function render() {
+
+                $back_compat = array(
+                        'appearance' => 'site-name',
+                );
+
                 // Link nodes to parents.
                 foreach ( $this->nodes as $node ) {
 
+                        if ( isset( $back_compat[ $node->parent ] ) )
+                                $node->parent = $back_compat[ $node->parent ];
+
                         // Handle root menu items
                         if ( empty( $node->parent ) ) {
                                 $parent = $this->root;