Changeset 5410

Timestamp:

11/29/2011 08:45:28 PM (15 years ago)

Author:

djpaul

Message:

When marking a user as not a spammer, mark all their activity as not spam, too.
Also removes legacy behaviour of changing activities' hide_sitewide when marking a user as a spammer.
See #3660.

Location:

trunk

Files:

• bp-activity/bp-activity-functions.php (modified) (2 diffs)
• bp-members/bp-members-actions.php (modified) (1 diff)

trunk/bp-activity/bp-activity-functions.php

@@ -661 +661 @@
 
         // Do not delete user data unless a logged in user says so
-        if ( empty( $user_id ) || !is_user_logged_in() )
+        if ( empty( $user_id ) || ! is_user_logged_in() )
                 return false;
 
@@ -699 +699 @@
 }
 add_action( 'bp_make_spam_user', 'bp_activity_spam_all_user_data' );
+
+/**
+ * Mark all of the user's activity as ham (not spam)
+ *
+ * @global object $wpdb
+ * @global object $bp BuddyPress global settings
+ * @param int $user_id
+ * @since 1.6
+ */
+function bp_activity_ham_all_user_data( $user_id = 0 ) {
+        global $bp, $wpdb;
+
+        // Do not delete user data unless a logged in user says so
+        if ( empty( $user_id ) || ! is_user_logged_in() )
+                return false;
+
+        // Get all the user's activities.
+        $activities = bp_activity_get( array( 'display_comments' => 'stream', 'filter' => array( 'user_id' => $user_id ), 'show_hidden' => true, 'spam' => 'all', ) );
+
+        // Mark each as not spam
+        foreach ( (array) $activities['activities'] as $activity ) {
+
+                // Create an activity object
+                $activity_obj = new BP_Activity_Activity;
+                foreach ( $activity as $k => $v )
+                        $activity_obj->$k = $v;
+
+                // Mark as not spam     
+                bp_activity_mark_as_ham( $activity_obj );
+
+                /*
+                 * If Akismet is present, update the activity history meta.
+                 *
+                 * This is usually taken care of when BP_Activity_Activity::save() happens, but
+                 * as we're going to be updating all the activity statuses directly, for efficency,
+                 * we need to update manually.
+                 */
+                if ( ! empty( $bp->activity->akismet ) )
+                        $bp->activity->akismet->update_activity_ham_meta( $activity_obj );
+
+                // Tidy up
+                unset( $activity_obj );
+        }
+
+        // Mark all of this user's activities as spam
+        $wpdb->query( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET is_spam = 0 WHERE user_id = %d", $user_id ) );
+
+        // Call an action for plugins to use
+        do_action( 'bp_activity_ham_all_user_data', $user_id, $activities['activities'] );
+}
+add_action( 'bp_make_ham_user', 'bp_activity_ham_all_user_data' );
 
 /**

trunk/bp-members/bp-members-actions.php

@@ -90 +90 @@
                 }
 
-                // Hide this user's activity
-                if ( $is_spam && bp_is_active( 'activity' ) ) {
-                        bp_activity_hide_user_activity( $user_id );
-                }
-
                 // We need a special hook for is_spam so that components can delete data at spam time
                 $bp_action = $is_spam ? 'bp_make_spam_user' : 'bp_make_ham_user';