Changeset 4363 for trunk/includes/core/template-functions.php

Timestamp:

11/08/2012 10:24:15 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Capabilities:

• Introduce bbp_user_has_profile() function in /users/capabilities.php.
• Use this function to suppress links to a profile of a user with no role on the site.
• Replaces some logic in bbp_parse_query() for setting user profile query variables.
• See #1939.

File:

• trunk/includes/core/template-functions.php (modified) (2 diffs)

trunk/includes/core/template-functions.php

@@ -317 +317 @@
                 }
 
-                // Create new user
-                $user = get_userdata( $bbp_user );
-
-                // 404 and bail if no user found, is inactive, or not a member
-                if ( empty( $user ) || ! is_user_member_of_blog( $user->ID ) || ( ! is_super_admin() && bbp_is_user_inactive( $user->ID ) ) ) {
+                // Cast as int, just in case
+                $bbp_user = (int) $bbp_user;
+
+                // 404 and bail if user does not have a profile
+                if ( ! bbp_user_has_profile( $bbp_user ) ) {
                         $posts_query->set_404();
                         return;
@@ -386 +386 @@
                 // Correct is_home variable
                 $posts_query->is_home = false;
+
+                // Get the user data
+                $user = get_userdata( $bbp_user );
 
                 // User is looking at their own profile