Changeset 18685

Timestamp:

09/16/2011 07:18:05 AM (13 years ago)

Author:

koopersmith

Message:

Show correct blogs in the admin bar sites menu. see #18197.

File:

• trunk/wp-includes/admin-bar.php (modified) (1 diff)

trunk/wp-includes/admin-bar.php

@@ -194 +194 @@
 
     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.