Changeset 8589

Timestamp:

07/10/2014 10:22:16 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Add return values to bp_blogs_record_existing_blogs() add use them in a new blog meta data recording repair tool. See #5749.

Location:

trunk/src

Files:

• bp-blogs/bp-blogs-functions.php (modified) (3 diffs)
• bp-core/admin/bp-core-tools.php (modified) (3 diffs)

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

@@ -79 +79 @@
                         $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", $wpdb->siteid ) );
 
+                        // If error running this query, set blog ID's to false
+                        if ( is_wp_error( $blog_ids ) ) {
+                                $blog_ids = false;
+                        }
+
                 // Large networks are not currently supported
                 } else {
@@ -91 +96 @@
         // Bail if there are no blogs in the network
         if ( empty( $blog_ids ) ) {
-                return;
-        }
-
-        // Truncate user blogs table and re-record.
-        $wpdb->query( "TRUNCATE {$bp->blogs->table_name}"          );
-        $wpdb->query( "TRUNCATE {$bp->blogs->table_name_blogmeta}" );
+                return false;
+        }
+
+        // Truncate user blogs table
+        $truncate = $wpdb->query( "TRUNCATE {$bp->blogs->table_name}" );
+        if ( is_wp_error( $truncate ) ) {
+                return false;
+        }
+
+        // Truncate user blogsmeta table
+        $truncate = $wpdb->query( "TRUNCATE {$bp->blogs->table_name_blogmeta}" );
+        if ( is_wp_error( $truncate ) ) {
+                return false;
+        }
 
         // Loop through users of blogs and record the relationship
@@ -130 +143 @@
                 }
         }
+
+        // No errors
+        return true;
 }
 

trunk/src/bp-core/admin/bp-core-tools.php

@@ -133 +133 @@
         }
 
+        // Blogs:
+        // - user blog count
+        if ( bp_is_active( 'blogs' ) ) {
+                $repair_list[90] = array(
+                        'bp-blog-records',
+                        __( 'Repopulate blogs records', 'buddypress' ),
+                        'bp_admin_repair_blog_records',
+                );
+        }
+
         ksort( $repair_list );
 
@@ -240 +250 @@
 
 /**
+ * Recalculate user-to-blog relationships and useful blog meta data
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @return array
+ */
+function bp_admin_repair_blog_records() {
+
+        // Description of this tool, dispalyed to the user
+        $statement = __( 'Repopulating Blogs records… %s', 'buddypress' );
+
+        // Default to failure text
+        $result    = __( 'Failed!',   'buddypress' );
+
+        // Default to unrepaired
+        $repair    = false;
+
+        // Run function if blogs component is active
+        if ( bp_is_active( 'blogs' ) ) {
+                $repair = bp_blogs_record_existing_blogs();
+        }
+
+        // Setup success/fail messaging
+        if ( true === $repair ) {
+                $result = __( 'Complete!', 'buddypress' );
+        }
+
+        // All done!
+        return array( 0, sprintf( $statement, $result ) );
+}
+
+/**
  * Recalculate the total number of active site members.
  *
@@ -282 +324 @@
                         case 0:
                                 return false;
-                                break;
 
                         case 1: