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

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

File:

• trunk/src/bp-members/bp-members-functions.php (modified) (2 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 );
     }