Changeset 6989

Timestamp:

05/02/2013 12:42:52 AM (13 years ago)

Author:

r-a-y

Message:

Add better logic in bp_is_user_spammer().

Mirror these changes to bp_is_user_deleted() as well.

File:

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

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

@@ -660 +660 @@
         $is_spammer = false;
 
-        // Get user data
+        // Setup our user
+        $user = false;
+
+        // Get locally-cached data if available
         switch ( $user_id ) {
                 case bp_loggedin_user_id() :
-                        $user = $bp->loggedin_user->userdata;
+                        $user = ! empty( $bp->loggedin_user->userdata ) ? $bp->loggedin_user->userdata : false;
                         break;
 
                 case bp_displayed_user_id() :
-                        $user = $bp->displayed_user->userdata;
+                        $user = ! empty( $bp->displayed_user->userdata ) ? $bp->displayed_user->userdata : false;
                         break;
-
-                default :
-                        $user = get_userdata( $user_id );
-                        break;
+        }
+
+        // Manually get userdata if still empty
+        if ( empty( $user ) ) {
+                $user = get_userdata( $user_id );
         }
 
@@ -706 +710 @@
                 return false;
 
+        $bp = buddypress();
+
         // Assume user is not deleted
         $is_deleted = false;
 
-        // Get user data
-        $user = get_userdata( $user_id );
+        // Setup our user
+        $user = false;
+
+        // Get locally-cached data if available
+        switch ( $user_id ) {
+                case bp_loggedin_user_id() :
+                        $user = ! empty( $bp->loggedin_user->userdata ) ? $bp->loggedin_user->userdata : false;
+                        break;
+
+                case bp_displayed_user_id() :
+                        $user = ! empty( $bp->displayed_user->userdata ) ? $bp->displayed_user->userdata : false;
+                        break;
+        }
+
+        // Manually get userdata if still empty
+        if ( empty( $user ) ) {
+                $user = get_userdata( $user_id );
+        }
 
         // No user found