Changeset 3434

Timestamp:

11/17/2010 03:23:04 AM (14 years ago)

Author:

boonebgorges

Message:

Fires custom BP hook when user is marked as spam, in order to account for instances where Network is not enabled. Fixes #1975

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-blogs.php (modified) (1 diff)
• bp-core.php (modified) (3 diffs)
• bp-friends.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)

trunk/bp-activity.php

@@ -1160 +1160 @@
 add_action( 'wpmu_delete_user', 'bp_activity_remove_data' );
 add_action( 'delete_user', 'bp_activity_remove_data' );
-add_action( 'make_spam_user', 'bp_activity_remove_data' );
+add_action( 'bp_make_spam_user', 'bp_activity_remove_data' );
 
 /**

trunk/bp-blogs.php

@@ -717 +717 @@
 add_action( 'wpmu_delete_user', 'bp_blogs_remove_data' );
 add_action( 'delete_user', 'bp_blogs_remove_data' );
-add_action( 'make_spam_user', 'bp_blogs_remove_data' );
+add_action( 'bp_make_spam_user', 'bp_blogs_remove_data' );
 
 

trunk/bp-core.php

@@ -458 +458 @@
 
         $wpdb->update( $wpdb->users, array( 'user_status' => $is_spam ), array( 'ID' => $bp->displayed_user->id ) );
-
+        
         if ( $is_spam )
             bp_core_add_message( __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' ) );
@@ -467 +467 @@
         if ( $is_spam && function_exists( 'bp_activity_hide_user_activity' ) )
             bp_activity_hide_user_activity( $bp->displayed_user->id );
+        
+        // We need a special hook for is_spam so that components can delete data at spam time
+        if ( $is_spam )
+                do_action( 'bp_make_spam_user', $bp->displayed_user->id );
 
         do_action( 'bp_core_action_set_spammer_status', $bp->displayed_user->id, $is_spam );
@@ -1912 +1916 @@
 add_action( 'wpmu_delete_user', 'bp_core_remove_data' );
 add_action( 'delete_user', 'bp_core_remove_data' );
-add_action( 'make_spam_user', 'bp_core_remove_data' );
+add_action( 'bp_make_spam_user', 'bp_core_remove_data' );
 
 /**

trunk/bp-friends.php

@@ -581 +581 @@
 add_action( 'wpmu_delete_user', 'friends_remove_data' );
 add_action( 'delete_user', 'friends_remove_data' );
-add_action( 'make_spam_user', 'friends_remove_data' );
+add_action( 'bp_make_spam_user', 'friends_remove_data' );
 
 

trunk/bp-xprofile.php

@@ -903 +903 @@
 add_action( 'wpmu_delete_user', 'xprofile_remove_data' );
 add_action( 'delete_user', 'xprofile_remove_data' );
-add_action( 'make_spam_user', 'xprofile_remove_data' );
+add_action( 'bp_make_spam_user', 'xprofile_remove_data' );
 
 /*** XProfile Meta ****************************************************/