Ticket #5275: 5275.03.patch

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

@@ -812 +812 @@
                         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 ) );
-
                 // Call multisite actions in single site mode for good measure
-                if ( !is_multisite() ) {
+                if ( ! is_multisite() && ! $is_admin ) {
                         if ( true === $is_spam ) {
 
                                 /**
@@ -843 +840 @@
                 }
         }
 
+        // Always set user status
+        $wpdb->update( $wpdb->users, array( 'user_status' => $is_spam ), array( 'ID' => $user_id ) );
+
         // Hide this user's activity
         if ( ( true === $is_spam ) && bp_is_active( 'activity' ) ) {
                 bp_activity_hide_user_activity( $user_id );

tests/phpunit/testcases/core/functions.php

@@ -648 +648 @@
                         date_default_timezone_set( $tz_backup );
                 }
         }
+
+        /**
+         * @group bp_core_process_spammer_status
+         */
+        public function test_bp_core_process_spammer_status() {
+                if ( is_multisite() ) {
+                        return;
+                }
+
+                $bp = buddypress();
+                $displayed_user = $bp->displayed_user;
+
+                $u1 = $this->factory->user->create();
+                $bp->displayed_user->id = $u1;
+
+                // Spam the user
+                bp_core_process_spammer_status( $u1, 'spam' );
+
+                $this->assertTrue( bp_is_user_spammer( $u1 ) );
+
+                // Unspam the user
+                bp_core_process_spammer_status( $u1, 'ham' );
+
+                clean_user_cache( $u1 );
+
+                $this->assertFalse( bp_is_user_spammer( $u1 ) );
+
+                // Reset displayed user
+                $bp->displayed_user = $displayed_user;
+        }
+
+        /**
+         * @group bp_core_process_spammer_status
+         */
+        public function test_bp_core_process_spammer_status_ms_bulk_spam() {
+                if ( ! is_multisite() ) {
+                        return;
+                }
+
+                $bp = buddypress();
+                $displayed_user = $bp->displayed_user;
+
+                $u1 = $this->factory->user->create();
+                $bp->displayed_user->id = $u1;
+
+                // Bulk spam in network admin uses update_user_status
+                update_user_status( $u1, 'spam', '1' );
+
+                $this->assertTrue( bp_is_user_spammer( $u1 ) );
+
+                // Unspam the user
+                bp_core_process_spammer_status( $u1, 'ham' );
+
+                clean_user_cache( $u1 );
+
+                $this->assertFalse( bp_is_user_spammer( $u1 ) );
+
+                // Reset displayed user
+                $bp->displayed_user = $displayed_user;
+        }
+
+        /**
+         * @group bp_core_process_spammer_status
+         */
+        public function test_bp_core_process_spammer_status_ms_bulk_ham() {
+                if ( ! is_multisite() ) {
+                        return;
+                }
+
+                $bp = buddypress();
+                $displayed_user = $bp->displayed_user;
+
+                $u1 = $this->factory->user->create();
+                $bp->displayed_user->id = $u1;
+
+                // Spam the user
+                bp_core_process_spammer_status( $u1, 'spam' );
+
+                $this->assertTrue( bp_is_user_spammer( $u1 ) );
+
+                // Bulk unspam in network admin uses update_user_status
+                update_user_status( $u1, 'spam', '0' );
+
+                clean_user_cache( $u1 );
+
+                $this->assertFalse( bp_is_user_spammer( $u1 ) );
+
+                // Reset displayed user
+                $bp->displayed_user = $displayed_user;
+        }
 }