Changeset 4107 for trunk/bp-blogs/bp-blogs-functions.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-blogs/bp-blogs-functions.php (modified) (4 diffs)

trunk/bp-blogs/bp-blogs-functions.php

@@ -265 +265 @@
 
 function bp_blogs_add_user_to_blog( $user_id, $role = false, $blog_id = 0 ) {
-    global $wpdb, $current_blog;
-
-    if ( empty( $blog_id ) && isset( $current_blog ) )
-        $blog_id = $current_blog->blog_id;
+    global $wpdb;
+
+    if ( empty( $blog_id ) && isset( $wpdb->blogid ) )
+        $blog_id = $wpdb->blogid;
     else
         $blog_id = BP_ROOT_BLOG;
@@ -291 +291 @@
 
 function bp_blogs_remove_user_from_blog( $user_id, $blog_id = 0 ) {
-    global $current_blog;
+    global $wpdb;
 
     if ( empty( $blog_id ) )
-        $blog_id = $current_blog->blog_id;
+        $blog_id = $wpdb->blogid;
 
     bp_blogs_remove_blog_for_user( $user_id, $blog_id );
@@ -330 +330 @@
 
 function bp_blogs_remove_post( $post_id, $blog_id = 0, $user_id = 0 ) {
-    global $current_blog, $bp;
-
-    if ( empty( $current_blog->blog_id ) )
+    global $wpdb, $bp;
+
+    if ( empty( $wpdb->blogid ) )
         return false;
 
@@ -338 +338 @@
 
     if ( !$blog_id )
-        $blog_id = (int)$current_blog->blog_id;
+        $blog_id = (int)$wpdb->blogid;
 
     if ( !$user_id )