Changeset 5338

Timestamp:

11/20/2011 12:30:52 AM (13 years ago)

Author:

boonebgorges

Message:

Don't fall back on root_blog when blog_id is passed to bp_blogs_add_user_to_blog(). Fixes #3755

File:

• branches/1.5/bp-blogs/bp-blogs-functions.php (modified) (2 diffs)

branches/1.5/bp-blogs/bp-blogs-functions.php

@@ -299 +299 @@
 function bp_blogs_add_user_to_blog( $user_id, $role = false, $blog_id = 0 ) {
     global $wpdb;
-
-    if ( empty( $blog_id ) && isset( $wpdb->blogid ) )
-        $blog_id = $wpdb->blogid;
-    else
-        $blog_id = bp_get_root_blog_id();
+    
+    if ( empty( $blog_id ) ) {
+        $blog_id = isset( $wpdb->blogid ) ? $wpdb->blogid : bp_get_root_blog_id();
+    }
 
     if ( empty( $role ) ) {
@@ -315 +314 @@
             return false;
     }
+    
+    
 
     if ( $role != 'subscriber' )