Changeset 4367

Timestamp:

11/09/2012 09:44:35 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Reverse logic in bbp_user_has_profile().
• Assume all users have profiles, and they must be explicitly disabled.
• This is a more natural default behavior, as rarely will a site need to restrict a user's profile to a specific central site.
• See #1939.

File:

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

trunk/includes/users/capabilities.php

@@ -594 +594 @@
 function bbp_user_has_profile( $user_id = 0 ) {
 
+    // Assume every user has a profile
+    $retval  = true;
+
     // Validate user ID, default to displayed or current user
     $user_id = bbp_get_user_id( $user_id, true, true );
@@ -604 +607 @@
         $retval = false;
 
-    // User found
-    } else {
-
-        // User is inactive, and current user is not a super admin
-        if ( ! is_super_admin() && bbp_is_user_inactive( $user->ID ) ) {
-            $retval = false;
-
-        // Check for site caps
-        } else {
-            $retval  = (bool) bbp_get_user_role( $user_id );
-        }
+    // User is inactive, and current user is not a super admin
+    } elseif ( ! is_super_admin() && bbp_is_user_inactive( $user->ID ) ) {
+        $retval = false;
     }