Changeset 6983

Timestamp:

05/01/2013 06:10:39 PM (13 years ago)

Author:

r-a-y

Message:

In bp_is_user_spammer(), if user is logged-in user or displayed user, use
the already-queried userdata.

Use bp_is_user_spammer() in bp_stop_live_spammer() function.

See #4814.

File:

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

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

@@ -655 +655 @@
                 return false;
 
+        $bp = buddypress();
+
         // Assume user is not spam
         $is_spammer = false;
 
         // Get user data
-        $user = get_userdata( $user_id );
+        switch ( $user_id ) {
+                case bp_loggedin_user_id() :
+                        $user = $bp->loggedin_user->userdata;
+                        break;
+
+                case bp_displayed_user_id() :
+                        $user = $bp->displayed_user->userdata;
+                        break;
+
+                default :
+                        $user = get_userdata( $user_id );
+                        break;
+        }
 
         // No user found
@@ -1432 +1446 @@
  */
 function bp_stop_live_spammer() {
-        $bp = buddypress();
-
         // user isn't logged in, so stop!
-        if ( empty( $bp->loggedin_user ) ) {
+        if ( ! is_user_logged_in() ) {
                 return;
         }
 
-        // get logged-in userdata
-        $user = $bp->loggedin_user->userdata;
-
-        // setup spammer boolean
-        $spammer = false;
-
-        // multisite spammer
-        if ( ! empty( $user->spam ) ) {
-                $spammer = true;
-
-        // single site spammer
-        } elseif ( $user->user_status == 1 ) {
-                $spammer = true;
-        }
-
         // if spammer, kills access to the site
-        if ( $spammer ) {
+        if ( bp_is_user_spammer( bp_loggedin_user_id() ) ) {
                 // the spammer will not be able to view any portion of the site whatsoever
                 // this is a good detterent as the user cannot re-register to the site easily