Changeset 19184

Timestamp:

11/06/2011 12:21:12 PM (13 years ago)

Author:

duck_

Message:

Hide Site Name menu if the user isn't a member and isn't a super admin. Always show My Sites if the user has a site, and don't remove the current site from the list. Fixes #19122.

File:

• trunk/wp-includes/admin-bar.php (modified) (3 diffs)

trunk/wp-includes/admin-bar.php

@@ -211 +211 @@
     global $current_site;
 
+    // Don't show for logged out users.
     if ( ! is_user_logged_in() )
+        return;
+
+    // Show only when the user is a member of this site, or they're a super admin.
+    if ( ! is_user_member_of_blog( get_current_user_id(), get_current_blog_id() ) && ! is_super_admin() )
         return;
 
@@ -273 +278 @@
         return;
 
-    // Show only when there are more than two items in the menu.
-    if ( count( $wp_admin_bar->user->blogs ) <= 1 && ! is_super_admin() )
+    // Show only when the user has at least one site, or they're a super admin.
+    if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() )
         return;
 
@@ -332 +337 @@
 
     foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
-        // 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" />';