Changeset 12450

Timestamp:

08/24/2019 02:53:10 PM (5 years ago)

Author:

imath

Message:

Anticipate the deprecation in WordPress 5.3 of update_user_status()

Introduce bp_core_update_member_status() in order to wrap wp_update_user() with needed argument to spam a user on multisite configurations.

Props espellcaste

Fixes #8123

Location:

trunk

Files:

• src/bp-members/bp-members-functions.php (modified) (2 diffs)
• tests/phpunit/testcases/blogs/functions.php (modified) (1 diff)
• tests/phpunit/testcases/core/class-bp-user-query.php (modified) (1 diff)
• tests/phpunit/testcases/members/functions.php (modified) (8 diffs)

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

@@ -611 +611 @@
 
 /**
+ * Update the spam status of the member on multisite configs.
+ *
+ * @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`.
+ * @return bool          True if the spam status of the member changed.
+ *                       False otherwise.
+ */
+function bp_core_update_member_status( $user_id = 0, $value = 0 ) {
+    if ( ! is_multisite() || ! $user_id ) {
+        return false;
+    }
+
+    /**
+     * The `update_user_status()` function is deprecated since WordPress 5.3.0.
+     * Continue to use it if WordPress current major version is lower than 5.3.
+     */
+    if ( bp_get_major_wp_version() < 5.3 ) {
+        return update_user_status( $user_id, 'spam', $value );
+    }
+
+    // Otherwise use the replacement function.
+    $user = wp_update_user( array(
+        'ID'   => $user_id,
+        'spam' => $value,
+    ) );
+
+    if ( is_wp_error( $user ) ) {
+        return false;
+    }
+
+    return true;
+}
+
+/**
  * Process a spammed or unspammed user.
  *
@@ -672 +708 @@
 
         // Finally, mark this user as a spammer.
-        if ( is_multisite() ) {
-            update_user_status( $user_id, 'spam', $is_spam );
-        }
+        bp_core_update_member_status( $user_id, $is_spam );
     }
 

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

@@ -290 +290 @@
         if ( function_exists( 'wp_initialize_site' ) ) {
             $this->setExpectedDeprecated( 'wpmu_new_blog' );
-        }
-
-        if ( is_multisite() && function_exists( 'wp_get_registered_image_subsizes' ) ) {
-            $this->setExpectedDeprecated( 'update_user_status' );
         }
 

trunk/tests/phpunit/testcases/core/class-bp-user-query.php

@@ -390 +390 @@
      */
     public function test_bp_user_query_type_alphabetical_spam_xprofileoff() {
-        if ( is_multisite() && function_exists( 'wp_get_registered_image_subsizes' ) ) {
-            $this->setExpectedDeprecated( 'update_user_status' );
-        }
-
         $u1 = self::factory()->user->create();
         $u2 = self::factory()->user->create();

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

@@ -379 +379 @@
         }
 
-        if ( is_multisite() && function_exists( 'wp_get_registered_image_subsizes' ) ) {
-            $this->setExpectedDeprecated( 'update_user_status' );
-        }
-
         $bp = buddypress();
         $displayed_user = $bp->displayed_user;
@@ -390 +386 @@
 
         // Bulk spam in network admin uses update_user_status
-        update_user_status( $u1, 'spam', '1' );
+        bp_core_update_member_status( $u1, '1' );
 
         $this->assertTrue( bp_is_user_spammer( $u1 ) );
@@ -411 +407 @@
         }
 
-        if ( is_multisite() && function_exists( 'wp_get_registered_image_subsizes' ) ) {
-            $this->setExpectedDeprecated( 'update_user_status' );
-        }
-
         $bp = buddypress();
         $displayed_user = $bp->displayed_user;
@@ -427 +419 @@
 
         // Bulk unspam in network admin uses update_user_status
-        update_user_status( $u1, 'spam', '0' );
+        bp_core_update_member_status( $u1, '0' );
 
         $this->assertFalse( bp_is_user_spammer( $u1 ) );
@@ -439 +431 @@
      */
     public function test_bp_core_process_spammer_status_make_spam_user_filter() {
-        if ( is_multisite() && function_exists( 'wp_get_registered_image_subsizes' ) ) {
-            $this->setExpectedDeprecated( 'update_user_status' );
-        }
-
         add_filter( 'make_spam_user', array( $this, 'notification_filter_callback' ) );
 
@@ -455 +443 @@
 
     public function test_bp_core_process_spammer_status_make_ham_user_filter() {
-        if ( is_multisite() && function_exists( 'wp_get_registered_image_subsizes' ) ) {
-            $this->setExpectedDeprecated( 'update_user_status' );
-        }
+        $u1 = self::factory()->user->create();
+        $s  = bp_core_process_spammer_status( $u1, 'spam' );
 
         add_filter( 'make_ham_user', array( $this, 'notification_filter_callback' ) );
 
-        $u1 = self::factory()->user->create();
-        $n = bp_core_process_spammer_status( $u1, 'ham' );
+        $h = bp_core_process_spammer_status( $u1, 'ham' );
 
         remove_filter( 'make_ham_user', array( $this, 'notification_filter_callback' ) );
@@ -471 +457 @@
 
     public function test_bp_core_process_spammer_status_bp_make_spam_user_filter() {
-        if ( is_multisite() && function_exists( 'wp_get_registered_image_subsizes' ) ) {
-            $this->setExpectedDeprecated( 'update_user_status' );
-        }
-
         add_filter( 'bp_make_spam_user', array( $this, 'notification_filter_callback' ) );
 
@@ -487 +469 @@
 
     public function test_bp_core_process_spammer_status_bp_make_ham_user_filter() {
-        if ( is_multisite() && function_exists( 'wp_get_registered_image_subsizes' ) ) {
-            $this->setExpectedDeprecated( 'update_user_status' );
-        }
-
         add_filter( 'bp_make_ham_user', array( $this, 'notification_filter_callback' ) );