Changeset 8174 for trunk/bp-members/bp-members-functions.php

Timestamp:

03/27/2014 06:02:00 PM (12 years ago)

Author:

boonebgorges

Message:

Enable Spam admin tools on non-MS users.php Dashboard panel

This change brings non-MS installations of BuddyPress closer to the
functionality that is native to WP Multisite, with respect to the ability to
manage spam/ham users from the Users panel. It also addresses a shortcoming
whereby admins on non-MS sites would have no way at all to spam/unspam users
if the Settings component was disabled, since the front-end Spam tools are in
that optional component.

Fixes #5113

Props imath, r-a-y

File:

• trunk/bp-members/bp-members-functions.php (modified) (4 diffs)

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

@@ -602 +602 @@
  * @param int $user_id The ID of the user being spammed/hammed.
  * @param string $status 'spam' if being marked as spam, 'ham' otherwise.
- */
-function bp_core_process_spammer_status( $user_id, $status ) {
+ * @param bool $do_wp_cleanup True to force the cleanup of WordPress content
+ *        and status, otherwise false. Generally, this should only be false if
+ *        WordPress is expected to have performed this cleanup independently,
+ *        as when hooked to 'make_spam_user'.
+ * @return bool True on success, false on failure.
+ */
+function bp_core_process_spammer_status( $user_id, $status, $do_wp_cleanup = true ) {
     global $wpdb;
 
@@ -632 +637 @@
 
     // When marking as spam in the Dashboard, these actions are handled by WordPress
-    if ( ! $is_admin ) {
+    if ( $do_wp_cleanup ) {
 
         // Get the blogs for the user
@@ -690 +695 @@
  */
 function bp_core_mark_user_spam_admin( $user_id ) {
-    bp_core_process_spammer_status( $user_id, 'spam' );
+    bp_core_process_spammer_status( $user_id, 'spam', false );
 }
 add_action( 'make_spam_user', 'bp_core_mark_user_spam_admin' );
@@ -702 +707 @@
  */
 function bp_core_mark_user_ham_admin( $user_id ) {
-    bp_core_process_spammer_status( $user_id, 'ham' );
+    bp_core_process_spammer_status( $user_id, 'ham', false );
 }
 add_action( 'make_ham_user', 'bp_core_mark_user_ham_admin' );