Ticket #2369: 2369.diff

bp-blogs.php

@@ -295 +295 @@
 }
 
 function bp_blogs_record_existing_blogs() {
-        global $bp, $wpdb;
+        global $bp, $wpdb, $current_site;
 
         /* Truncate user blogs table and re-record. */
         $wpdb->query( "TRUNCATE TABLE {$bp->blogs->table_name}" );
 
-        $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0" ) );
+        $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0 AND site_id = %d", $current_site->id ) );
 
         if ( $blog_ids ) {
                 foreach( (array)$blog_ids as $blog_id ) {
@@ -747 +747 @@
 add_action( 'bp_blogs_new_blog', 'bp_core_clear_cache' );
 add_action( 'bp_blogs_remove_data', 'bp_core_clear_cache' );
 
-?>
- No newline at end of file
+?>