Changeset 4107 for trunk/bp-members/bp-members-buddybar.php

Timestamp:

03/11/2011 06:02:47 PM (15 years ago)

Author:

boonebgorges

Message:

Audit of the use of ->blog_id to change to ->blogid where possible, to better account for switch_to_blog() use. Fixes #2984. Props wpmuguru

File:

• trunk/bp-members/bp-members-buddybar.php (modified) (2 diffs)

trunk/bp-members/bp-members-buddybar.php

@@ -42 +42 @@
 // **** "Blog Authors" Menu (visible when not logged in) ********
 function bp_adminbar_authors_menu() {
-        global $bp, $current_blog, $wpdb;
+        global $bp, $wpdb;
 
         // Only for multisite
@@ -49 +49 @@
 
         // Hide on root blog
-        if ( $current_blog->blog_id == BP_ROOT_BLOG || !bp_is_active( 'blogs' ) )
-                return false;
-
-        $blog_prefix = $wpdb->get_blog_prefix( $current_blog->blog_id );
+        if ( $wpdb->blogid == BP_ROOT_BLOG || !bp_is_active( 'blogs' ) )
+                return false;
+
+        $blog_prefix = $wpdb->get_blog_prefix( $wpdb->blogid );
         $authors     = $wpdb->get_results( "SELECT user_id, user_login, user_nicename, display_name, user_email, meta_value as caps FROM $wpdb->users u, $wpdb->usermeta um WHERE u.ID = um.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY um.user_id" );