Changeset 9398 for trunk/src/bp-members/bp-members-functions.php

Timestamp:

01/22/2015 01:31:56 PM (10 years ago)

Author:

imath

Message:

On multisite configs, make sure unspamming the user from the Users Network Administration screen is updating the .

When a user is marked as spam from the front end, then marked as ham from the network-users administration screen using the 'unspam' bulk action, we need to be sure the field of the users table is updated so that BuddyPress effectively takes in account the user has been unspammed.

This commit also makes sure the user's cache has been cleared.

Fixes #5275

File:

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

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

@@ -786 +786 @@
     remove_action( 'make_ham_user',  'bp_core_mark_user_ham_admin'  );
 
-    // Determine if we are on an admin page
-    $is_admin = is_admin();
-    if ( $is_admin && ! defined( 'DOING_AJAX' ) ) {
-        $is_admin = (bool) ( buddypress()->members->admin->user_page !== get_current_screen()->id );
-    }
-
-    // When marking as spam in the Dashboard, these actions are handled by WordPress
+    // force the cleanup of WordPress content and status for multisite configs
     if ( $do_wp_cleanup ) {
 
@@ -813 +807 @@
             update_user_status( $user_id, 'spam', $is_spam );
         }
-
-        // Always set single site status
-        $wpdb->update( $wpdb->users, array( 'user_status' => $is_spam ), array( 'ID' => $user_id ) );
-
+    }
+
+    // Update the user status
+    $wpdb->update( $wpdb->users, array( 'user_status' => $is_spam ), array( 'ID' => $user_id ) );
+
+    // Clean user cache
+    clean_user_cache( $user_id );
+
+    if ( ! is_multisite() ) {
         // Call multisite actions in single site mode for good measure
-        if ( !is_multisite() ) {
-            if ( true === $is_spam ) {
-
-                /**
-                 * Fires at end of processing spammer in Dashboard if not multisite and user is spam.
-                 *
-                 * @since BuddyPress (1.5.0)
-                 *
-                 * @param int $value Displayed user ID.
-                 */
-                do_action( 'make_spam_user', bp_displayed_user_id() );
-            } else {
-
-                /**
-                 * Fires at end of processing spammer in Dashboard if not multisite and user is not spam.
-                 *
-                 * @since BuddyPress (1.5.0)
-                 *
-                 * @param int $value Displayed user ID.
-                 */
-                do_action( 'make_ham_user', bp_displayed_user_id() );
-            }
-
-
+        if ( true === $is_spam ) {
+
+            /**
+             * Fires at end of processing spammer in Dashboard if not multisite and user is spam.
+             *
+             * @since BuddyPress (1.5.0)
+             *
+             * @param int $value user ID.
+             */
+            do_action( 'make_spam_user', $user_id );
+        } else {
+
+            /**
+             * Fires at end of processing spammer in Dashboard if not multisite and user is not spam.
+             *
+             * @since BuddyPress (1.5.0)
+             *
+             * @param int $value user ID.
+             */
+            do_action( 'make_ham_user', $user_id );
         }
     }