Changeset 16050 for trunk/wp-includes/admin-bar/admin-bar-class.php

Timestamp:

10/28/2010 03:46:11 PM (15 years ago)

Author:

ryan

Message:

get_current_blog_id(). Props aaroncampbell. fixes #15233

File:

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

trunk/wp-includes/admin-bar/admin-bar-class.php

@@ -8 +8 @@
 
     function initialize() {
-        global $blog_id;
-
         /* Only load super admin menu code if the logged in user is a super admin */
         if ( is_super_admin() ) {
@@ -29 +27 @@
             $this->user->account_domain = $this->user->domain;
         } else {
-            $this->user->active_blog = $this->user->blogs[$blog_id];
+            $this->user->active_blog = $this->user->blogs[get_current_blog_id()];
             $this->user->domain = trailingslashit( home_url() );
             $this->user->account_domain = $this->user->domain;
@@ -86 +84 @@
         return $this->remove_node( $id, $this->menu );
     }
-    
+
     function render() {
         ?>