Changeset 8124

Timestamp:

03/13/2014 11:45:17 AM (11 years ago)

Author:

boonebgorges

Message:

Introduce tool on Tools menu for repairing last_activity data

Fixes #5461

Location:

trunk

Files:

• bp-core/admin/bp-core-tools.php (modified) (2 diffs)
• bp-core/bp-core-update.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (1 diff)

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

@@ -96 +96 @@
  */
 function bp_admin_repair_list() {
+    $repair_list = array();
+
     // Members:
     // - member count
-    $repair_list = array(
-        20 => array(
-            'bp-total-member-count',
-            __( 'Count total members', 'buddypress' ),
-            'bp_admin_repair_count_members',
-        ),
+    // - last_activity migration (2.0)
+    $repair_list[20] = array(
+        'bp-total-member-count',
+        __( 'Count total members', 'buddypress' ),
+        'bp_admin_repair_count_members',
+    );
+
+    $repair_list[25] = array(
+        'bp-last-activity',
+        __( 'Repair user "last activity" data', 'buddypress' ),
+        'bp_admin_repair_last_activity',
     );
 
@@ -241 +248 @@
     delete_transient( 'bp_active_member_count' );
     bp_core_get_active_member_count();
+    return array( 0, sprintf( $statement, __( 'Complete!', 'buddypress' ) ) );
+}
+
+/**
+ * Repair user last_activity data.
+ *
+ * Re-runs the migration from usermeta introduced in BP 2.0.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_admin_repair_last_activity() {
+    $statement = __( 'Determining last activity dates for each user… %s', 'buddypress' );
+    bp_last_activity_migrate();
     return array( 0, sprintf( $statement, __( 'Complete!', 'buddypress' ) ) );
 }

trunk/bp-core/bp-core-update.php

@@ -346 +346 @@
     bp_core_install_activity_streams();
 
-    $bp = buddypress();
-
     /** Migrate 'last_activity' data *************************************/
 
-    // The "NOT IN" clause prevents duplicates
-    $sql = "INSERT INTO {$bp->members->table_name_last_activity} (`user_id`, `component`, `type`, `action`, `content`, `primary_link`, `item_id`, `date_recorded` ) (
-          SELECT user_id, '{$bp->members->id}' as component, 'last_activity' as type, '' as action, '' as content, '' as primary_link, 0 as item_id, meta_value AS date_recorded
-          FROM {$wpdb->usermeta}
-          WHERE
-            meta_key = 'last_activity'
-            AND
-            user_id NOT IN (
-              SELECT user_id
-              FROM {$bp->members->table_name_last_activity}
-              WHERE component = '{$bp->members->id}' AND type = 'last_activity'
-            )
-    );";
-
-    $wpdb->query( $sql );
+    bp_last_activity_migrate();
 
     /** Migrate signups data *********************************************/

trunk/bp-members/bp-members-functions.php

@@ -989 +989 @@
 
     return apply_filters( 'bp_get_user_last_activity', $activity, $user_id );
+}
+
+/**
+ * Migrate last_activity data from the usermeta table to the activity table.
+ *
+ * Generally, this function is only run when BP is upgraded to 2.0. It can also
+ * be called directly from the BuddyPress Tools panel.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+function bp_last_activity_migrate() {
+    global $wpdb;
+
+    $bp = buddypress();
+
+    // The "NOT IN" clause prevents duplicates
+    $sql = "INSERT INTO {$bp->members->table_name_last_activity} (`user_id`, `component`, `type`, `action`, `content`, `primary_link`, `item_id`, `date_recorded` ) (
+          SELECT user_id, '{$bp->members->id}' as component, 'last_activity' as type, '' as action, '' as content, '' as primary_link, 0 as item_id, meta_value AS date_recorded
+          FROM {$wpdb->usermeta}
+          WHERE
+            meta_key = 'last_activity'
+            AND
+            user_id NOT IN (
+              SELECT user_id
+              FROM {$bp->members->table_name_last_activity}
+              WHERE component = '{$bp->members->id}' AND type = 'last_activity'
+            )
+    );";
+
+    return $wpdb->query( $sql );
 }