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

Timestamp:

01/02/2026 07:10:26 PM (4 months ago)

Author:

espellcaste

Message:

Switch the function that updates the spam status of the member on multisite configs and deprecate bp_core_update_member_status.

Since WordPress 5.3, the user status is now updated using the globally available wp_update_user() function. So let us use it instead and deprecate bp_core_update_member_status().

It includes some minor Docblock changes.

Props imath.

Closes ​https://github.com/buddypress/buddypress/pull/434/
See #9173
Fixes #9167

File:

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

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

@@ -644 +644 @@
 
 /**
- * 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 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.
- */
-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 );
-    }
-
-    if ( $value ) {
-        $value = '1';
-    }
-
-    // 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.
  *
@@ -712 +670 @@
     // Bail if no user ID.
     if ( empty( $user_id ) ) {
-        return;
+        return false;
     }
 
     // Bail if user ID is super admin.
     if ( is_super_admin( $user_id ) ) {
-        return;
+        return false;
     }
 
     // Get the functions file.
     if ( is_multisite() ) {
-        require_once( ABSPATH . 'wp-admin/includes/ms.php' );
-    }
-
-    $is_spam = ( 'spam' == $status );
+        require_once ABSPATH . 'wp-admin/includes/ms.php';
+    }
+
+    $is_spam = 'spam' === $status;
 
     // Only you can prevent infinite loops.
     remove_action( 'make_spam_user', 'bp_core_mark_user_spam_admin' );
-    remove_action( 'make_ham_user',  'bp_core_mark_user_ham_admin' );
+    remove_action( 'make_ham_user', 'bp_core_mark_user_ham_admin' );
 
     // Force the cleanup of WordPress content and status for multisite configs.
@@ -778 +736 @@
             }
         }
-
-        // Finally, mark this user as a spammer.
-        bp_core_update_member_status( $user_id, $is_spam );
-    }
-
-    // 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() ) {
+    }
+
+    // Update user status on multisite configs.
+    if ( is_multisite() ) {
+        $updated_user = wp_update_user(
+            array(
+                'ID'   => $user_id,
+                'spam' => $is_spam ? '1' : '0',
+            )
+        );
+
+        if ( is_wp_error( $updated_user ) ) {
+            return false;
+        }
+    } else {
+        // We need to perform the query as WordPress sends an error when using `wp_update_user()` for non-multisite configs.
+        $wpdb->update( $wpdb->users, array( 'user_status' => $is_spam ), array( 'ID' => $user_id ) );
+
+        // Clean user cache.
+        clean_user_cache( $user_id );
+
         // Call multisite actions in single site mode for good measure.
         if ( true === $is_spam ) {
 
             /**
-             * Fires at end of processing spammer in Dashboard if not multisite and user is spam.
+             * Fires at end of processing spammer in Dashboard if not multisite and user IS spam.
              *
              * @since 1.5.0
              *
-             * @param int $value user ID.
+             * @param int $user_id user ID.
              */
             do_action( 'make_spam_user', $user_id );
@@ -804 +771 @@
 
             /**
-             * Fires at end of processing spammer in Dashboard if not multisite and user is not spam.
+             * Fires at end of processing spammer in Dashboard if not multisite and user IS NOT spam.
              *
              * @since 1.5.0
              *
-             * @param int $value user ID.
+             * @param int $user_id user ID.
              */
             do_action( 'make_ham_user', $user_id );
@@ -827 +794 @@
          * @since 1.5.0
          *
-         * @param int $value Displayed user ID.
+         * @param int $user_id Displayed user ID.
          */
         do_action( 'bp_make_spam_user', $user_id );
@@ -837 +804 @@
          * @since 1.5.0
          *
-         * @param int $value Displayed user ID.
+         * @param int $user_id Displayed user ID.
          */
         do_action( 'bp_make_ham_user', $user_id );
@@ -858 +825 @@
     return true;
 }
+
 /**
  * Hook to WP's make_spam_user and run our custom BP spam functions.