Changeset 4107 for trunk/bp-core/bp-core-catchuri.php

Timestamp:

03/11/2011 06:02:47 PM (14 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-core/bp-core-catchuri.php (modified) (2 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -28 +28 @@
 function bp_core_set_uri_globals() {
     global $bp, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
-    global $current_blog;
+    global $current_blog, $wpdb;
 
     // Create global component, action, and item variables
@@ -37 +37 @@
     // on multiple blogs
     if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() ) {
-        if ( BP_ROOT_BLOG != (int) $current_blog->blog_id )
+        if ( BP_ROOT_BLOG != (int) $wpdb->blogid )
             return false;
     }