Changeset 8599

Timestamp:

07/11/2014 09:25:08 PM (10 years ago)

Author:

johnjamesjacoby

Message:

More clean up in bp_blogs_record_existing_blogs():

• Do not touch the $bp global directly.
• Remove user/subscriber intersection and use bp_blogs_add_user_to_blog() instead of bp_blogs_record_blog(). This reduces complexity and leans on a function purpose-built for doing this comparison rather than duplicating part of that logic.

See #5749.

File:

• trunk/src/bp-blogs/bp-blogs-functions.php (modified) (5 diffs)

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

@@ -74 +74 @@
  * Populate the BP blogs table with existing blogs.
  *
- * @global object $bp BuddyPress global settings
+ * @since BuddyPress (1.0.0)
+ *
  * @global object $wpdb WordPress database object
  * @uses get_users()
@@ -80 +81 @@
  */
 function bp_blogs_record_existing_blogs() {
-    global $bp, $wpdb;
+    global $wpdb;
 
     // Query for all sites in network
@@ -109 +110 @@
     }
 
+    // Get BuddyPress
+    $bp = buddypress();
+
     // Truncate user blogs table
     $truncate = $wpdb->query( "TRUNCATE {$bp->blogs->table_name}" );
@@ -128 +132 @@
 
         // Get all users
-        $all_users = get_users( array(
-            'blog_id' => $blog_id,
-            'fields'  => 'ID'
+        $users = get_users( array(
+            'blog_id' => $blog_id
         ) );
-        
-        // Get subscribers
-        $subscribers = get_users( array(
-            'blog_id' => $blog_id,
-            'fields'  => 'ID',
-            'role'    => 'subscriber'
-        ) );
-
-        // Remove subscribers from users (for some legacy/wpcom reason?)
-        $users = array_values( array_diff( $all_users, $subscribers ) );
-
-        // Reclaim some memory in the event there are many users
-        unset( $all_users, $subscribers );
 
         // Continue on if no users exist for this site (how did this happen?)
@@ -153 +143 @@
         // Loop through users and record their relationship to this blog
         foreach ( (array) $users as $user ) {
-            bp_blogs_record_blog( $blog_id, $user, true );
+            bp_blogs_add_user_to_blog( $user->ID, false, $blog_id );
         }
     }