Changeset 4592

Timestamp:

07/04/2011 06:54:19 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Update bp_core_is_user_spammer() and bp_core_is_user_deleted() functions to use get_userdata() to take advantage of WP object cache.

File:

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

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

@@ -482 +482 @@
         global $wpdb;
 
-        if ( is_multisite() )
-                $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM $wpdb->users WHERE ID = %d", $user_id ) );
-        else
-                $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT user_status FROM $wpdb->users WHERE ID = %d", $user_id ) );
-
-        return apply_filters( 'bp_core_is_user_spammer', $is_spammer );
+        // Assume user is not spam
+        $is_spammer = false;
+
+        // Get user data
+        $user = get_userdata( $user_id );
+
+        // No user found
+        if ( empty( $user ) ) {
+                $is_spammer = false;
+                
+        // User found
+        } else {
+
+                // Check if spam
+                if ( !empty( $user->spam ) )
+                        $is_spammer = true;
+
+                if ( 'spam' == $user->user_status )
+                        $is_spammer = true;
+        }
+
+        return apply_filters( 'bp_core_is_user_spammer', (bool) $is_spammer );
 }
 
@@ -500 +516 @@
         global $wpdb;
 
-        return apply_filters( 'bp_core_is_user_spammer', (int) $wpdb->get_var( $wpdb->prepare( "SELECT deleted FROM $wpdb->users WHERE ID = %d", $user_id ) ) );
+        // Assume user is not deleted
+        $is_deleted = false;
+
+        // Get user data
+        $user = get_userdata( $user_id );
+
+        // No user found
+        if ( empty( $user ) ) {
+                $is_deleted = true;
+                
+        // User found
+        } else {
+
+                // Check if deleted
+                if ( !empty( $user->deleted ) )
+                        $is_deleted = true;
+
+                if ( 'deleted' == $user->user_status )
+                        $is_deleted = true;
+
+        }
+
+        return apply_filters( 'bp_core_is_user_deleted', (bool) $is_deleted );
 }