Changeset 4370

Timestamp:

11/09/2012 12:06:34 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Users:

• Update _is_ functions for user_status (spam|deleted)
• Remove check of 'user_status' column value, since core only uses 'spam' and 'deleted' now.
• Fixes issue where a 'user_status' setting would produce a false positive.

File:

• trunk/includes/users/capabilities.php (modified) (2 diffs)

trunk/includes/users/capabilities.php

@@ -287 +287 @@
         $is_spammer = false;
 
-    // User found
-    } else {
-
-        // Check if spam
-        if ( !empty( $user->spam ) )
-            $is_spammer = true;
-
-        if ( 1 == $user->user_status )
-            $is_spammer = true;
-    }
-
-    return apply_filters( 'bp_core_is_user_spammer', (bool) $is_spammer );
+    // Check if spam
+    } elseif ( !empty( $user->spam ) ) {
+        $is_spammer = true;
+    }
+
+    return (bool) apply_filters( 'bp_core_is_user_spammer', $is_spammer );
 }
 
@@ -500 +494 @@
         $is_deleted = true;
 
-    // User found
-    } else {
-
-        // Check if deleted
-        if ( !empty( $user->deleted ) )
-            $is_deleted = true;
-
-        if ( 2 == $user->user_status )
-            $is_deleted = true;
-
-    }
-
-    return apply_filters( 'bp_core_is_user_deleted', (bool) $is_deleted );
+    // Check if deleted
+    } elseif ( !empty( $user->deleted ) ) {
+        $is_deleted = true;
+    }
+
+    return (bool) apply_filters( 'bp_core_is_user_deleted', $is_deleted );
 }