From 5a7a91af5f3623e763cfd3401389950f0bce0e53 Mon Sep 17 00:00:00 2001
From: koopersmith <koopersmith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 16 Sep 2011 07:18:05 +0000
Subject: [PATCH] Show correct blogs in the admin bar sites menu. see #18197.

git-svn-id: http://svn.automattic.com/wordpress/trunk@18685 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/admin-bar.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index 485802aa3c..7e4dc96917 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -193,9 +193,10 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 	$blue_wp_logo_url = includes_url('images/wpmini-blue.png');
 
 	foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
-		// Skip the current blog.
-		if ( $blog->userblog_id == $wp_admin_bar->user->active_blog->blog_id )
+		// Skip the current blog (unless we're in the network/user admin).
+		if ( $blog->userblog_id == get_current_blog_id() && ! is_network_admin() && ! is_user_admin() ) {
 			continue;
+		}
 
 		// @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" />';