Changeset 13894

Timestamp:

06/02/2024 06:35:51 AM (14 months ago)

Author:

imath

Message:

Spamming users/Multisite: WP spam marker value is now the '1' string

See ​https://core.trac.wordpress.org/changeset/58261/

Fixes #9166
Closes ​https://github.com/buddypress/buddypress/pull/309

Location:

trunk

Files:

• src/bp-members/bp-members-functions.php (modified) (2 diffs)
• tests/phpunit/testcases/members/functions.php (modified) (6 diffs)

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

@@ -647 +647 @@
  * @since 5.0.0
  *
- * @param int $user_id The user ID to spam or ham.
- * @param int $value   0 to mark the user as `ham`, 1 to mark as `spam`.
+ * @param int    $user_id The user ID to spam or ham.
+ * @param string $value   '0' to mark the user as `ham`, '1' to mark as `spam`.
  * @return bool          True if the spam status of the member changed.
  *                       False otherwise.
@@ -665 +665 @@
     }
 
+    if ( $value ) {
+        $value = '1';
+    }
+
     // Otherwise use the replacement function.
-    $user = wp_update_user( array(
-        'ID'   => $user_id,
-        'spam' => $value,
-    ) );
+    $user = wp_update_user(
+        array(
+            'ID'   => $user_id,
+            'spam' => $value,
+        )
+    );
 
     if ( is_wp_error( $user ) ) {

trunk/tests/phpunit/testcases/members/functions.php

@@ -6 +6 @@
 class BP_Tests_Members_Functions extends BP_UnitTestCase {
     protected $permalink_structure = '';
+    protected $filter_fired = '';
 
     public function set_up() {
@@ -507 +508 @@
     }
 
+    public function notification_filter_callback() {
+        $this->filter_fired = current_action();
+    }
+
     /**
      * @group bp_core_process_spammer_status
      */
     public function test_bp_core_process_spammer_status_make_spam_user_filter() {
-        add_filter( 'make_spam_user', array( $this, 'notification_filter_callback' ) );
-
-        $u1 = self::factory()->user->create();
+        $u1 = self::factory()->user->create();
+
+        add_action( 'make_spam_user', array( $this, 'notification_filter_callback' ) );
+
         $n = bp_core_process_spammer_status( $u1, 'spam' );
 
-        remove_filter( 'make_spam_user', array( $this, 'notification_filter_callback' ) );
+        remove_action( 'make_spam_user', array( $this, 'notification_filter_callback' ) );
 
         $this->assertSame( 'make_spam_user', $this->filter_fired );
-
     }
 
@@ -526 +531 @@
         $s  = bp_core_process_spammer_status( $u1, 'spam' );
 
-        add_filter( 'make_ham_user', array( $this, 'notification_filter_callback' ) );
+        add_action( 'make_ham_user', array( $this, 'notification_filter_callback' ) );
 
         $h = bp_core_process_spammer_status( $u1, 'ham' );
 
-        remove_filter( 'make_ham_user', array( $this, 'notification_filter_callback' ) );
+        remove_action( 'make_ham_user', array( $this, 'notification_filter_callback' ) );
 
         $this->assertSame( 'make_ham_user', $this->filter_fired );
@@ -537 +542 @@
 
     public function test_bp_core_process_spammer_status_bp_make_spam_user_filter() {
-        add_filter( 'bp_make_spam_user', array( $this, 'notification_filter_callback' ) );
+        add_action( 'bp_make_spam_user', array( $this, 'notification_filter_callback' ) );
 
         $u1 = self::factory()->user->create();
         $n = bp_core_process_spammer_status( $u1, 'spam' );
 
-        remove_filter( 'bp_make_spam_user', array( $this, 'notification_filter_callback' ) );
+        remove_action( 'bp_make_spam_user', array( $this, 'notification_filter_callback' ) );
 
         $this->assertSame( 'bp_make_spam_user', $this->filter_fired );
@@ -549 +554 @@
 
     public function test_bp_core_process_spammer_status_bp_make_ham_user_filter() {
-        add_filter( 'bp_make_ham_user', array( $this, 'notification_filter_callback' ) );
+        add_action( 'bp_make_ham_user', array( $this, 'notification_filter_callback' ) );
 
         $u1 = self::factory()->user->create();
         $n = bp_core_process_spammer_status( $u1, 'ham' );
 
-        remove_filter( 'bp_make_ham_user', array( $this, 'notification_filter_callback' ) );
+        remove_action( 'bp_make_ham_user', array( $this, 'notification_filter_callback' ) );
 
         $this->assertSame( 'bp_make_ham_user', $this->filter_fired );
@@ -583 +588 @@
         $site = get_site( $b1 );
         $this->assertEmpty( $site->spam );
-    }
-
-    public function notification_filter_callback( $value ) {
-        $this->filter_fired = current_filter();
-        return $value;
     }