Ticket #18188: 18188.3.diff

wp-includes/admin-bar.php

@@ -287 +287 @@
         if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() )
                 return;
 
+        $is_list_secondary = false;
+
         $wp_admin_bar->add_menu( array(
                 'id'    => 'my-sites',
                 'title' => __( 'My Sites' ),
                 'href'  => admin_url( 'my-sites.php' ),
         ) );
 
-        if ( is_super_admin() ) {
+        if ( is_super_admin() && is_blog_admin() ) {
+                $is_list_secondary = true;
+
                 $wp_admin_bar->add_group( array(
                         'parent' => 'my-sites',
                         'id'     => 'my-sites-super-admin',
@@ -332 +336 @@
                 ) );
         }
 
+        if ( is_network_admin() && is_super_admin() ) {
+                if ( 'sites' == get_current_screen()->parent_base && !empty( $_REQUEST['id'] ) ) {
+                        $is_list_secondary = true;
+                        $site = get_blog_details( intval( $_REQUEST['id'] ), true );
+                        $site->userblog_id = $site->blog_id;
+                        _wp_admin_bar_site_menu( $site, 'edit-site', 'my-sites', $wp_admin_bar );
+                }
+        }
+
         // Add site links
         $wp_admin_bar->add_group( array(
                 'parent' => 'my-sites',
                 'id'     => 'my-sites-list',
                 'meta'   => array(
-                        'class' => is_super_admin() ? 'ab-sub-secondary' : '',
+                        'class' => $is_list_secondary ? 'ab-sub-secondary' : '',
                 ),
         ) );
 
+        foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
+                if ( isset( $site ) && ( $site->userblog_id == $blog->userblog_id ) )
+                        continue;
+                _wp_admin_bar_site_menu( $blog, 'blog-' . $blog->userblog_id, 'my-sites-list', $wp_admin_bar );
+        }
+}
+
+function _wp_admin_bar_site_menu( $blog, $menu_id, $parent, $wp_admin_bar ) {
         $blue_wp_logo_url = includes_url('images/wpmini-blue.png');
+        // @todo Replace with some favicon lookup.
+        //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $blue_wp_logo_url ) ) . '" alt="Blavatar" width="16" height="16" />';
+        $blavatar = '<img src="' . esc_url($blue_wp_logo_url) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>';
 
-        foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
-                // @todo Replace with some favicon lookup.
-                //$blavatar = '<img src="' . esc_url( blavatar_url( blavatar_domain( $blog->siteurl ), 'img', 16, $blue_wp_logo_url ) ) . '" alt="Blavatar" width="16" height="16" />';
-                $blavatar = '<img src="' . esc_url($blue_wp_logo_url) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>';
+        $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
 
-                $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
-                $menu_id  = 'blog-' . $blog->userblog_id;
+        $wp_admin_bar->add_menu( array(
+                'parent'    => $parent,
+                'id'        => $menu_id,
+                'title'     => $blavatar . $blogname,
+                'href'      => get_admin_url( $blog->userblog_id ),
+        ) );
 
-                $wp_admin_bar->add_menu( array(
-                        'parent'    => 'my-sites-list',
-                        'id'        => $menu_id,
-                        'title'     => $blavatar . $blogname,
-                        'href'      => get_admin_url( $blog->userblog_id ),
-                ) );
+        $wp_admin_bar->add_menu( array(
+                'parent' => $menu_id,
+                'id'     => $menu_id . '-d',
+                'title'  => __( 'Dashboard' ),
+                'href'   => get_admin_url( $blog->userblog_id ),
+        ) );
 
+        if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) {
                 $wp_admin_bar->add_menu( array(
                         'parent' => $menu_id,
-                        'id'     => $menu_id . '-d',
-                        'title'  => __( 'Dashboard' ),
-                        'href'   => get_admin_url( $blog->userblog_id ),
+                        'id'     => $menu_id . '-n',
+                        'title'  => __( 'New Post' ),
+                        'href'   => get_admin_url( $blog->userblog_id, 'post-new.php' ),
                 ) );
-
-                if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) {
-                        $wp_admin_bar->add_menu( array(
-                                'parent' => $menu_id,
-                                'id'     => $menu_id . '-n',
-                                'title'  => __( 'New Post' ),
-                                'href'   => get_admin_url( $blog->userblog_id, 'post-new.php' ),
-                        ) );
-                        $wp_admin_bar->add_menu( array(
-                                'parent' => $menu_id,
-                                'id'     => $menu_id . '-c',
-                                'title'  => __( 'Manage Comments' ),
-                                'href'   => get_admin_url( $blog->userblog_id, 'edit-comments.php' ),
-                        ) );
-                }
-
                 $wp_admin_bar->add_menu( array(
                         'parent' => $menu_id,
-                        'id'     => $menu_id . '-v',
-                        'title'  => __( 'Visit Site' ),
-                        'href'   => get_home_url( $blog->userblog_id, '/' ),
+                        'id'     => $menu_id . '-c',
+                        'title'  => __( 'Manage Comments' ),
+                        'href'   => get_admin_url( $blog->userblog_id, 'edit-comments.php' ),
                 ) );
         }
+
+        $wp_admin_bar->add_menu( array(
+                'parent' => $menu_id,
+                'id'     => $menu_id . '-v',
+                'title'  => __( 'Visit Site' ),
+                'href'   => get_home_url( $blog->userblog_id, '/' ),
+        ) );
 }
 
 /**