Changeset 5301 for trunk/bp-core/bp-core-catchuri.php

Timestamp:

11/08/2011 01:14:31 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Use bp_displayed_user_id() rather than reference the $bp->displayed_user->id global var directly. First step at consolidating user ID checks to use WP_User class later. See #3738.

File:

• trunk/bp-core/bp-core-catchuri.php (modified) (2 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -238 +238 @@
 
                 // Switch the displayed_user based on compatbility mode
-                if ( bp_is_username_compatibility_mode() )
+                if ( bp_is_username_compatibility_mode() ) {
                     $bp->displayed_user->id = (int) bp_core_get_userid( urldecode( $bp_uri[$uri_offset + 1] ) );
-                else
+                } else {
                     $bp->displayed_user->id = (int) bp_core_get_userid_from_nicename( urldecode( $bp_uri[$uri_offset + 1] ) );
-
-                if ( empty( $bp->displayed_user->id ) ) {
+                }
+
+                if ( !bp_displayed_user_id() ) {
+
                     // Prevent components from loading their templates
                     $bp->current_component = '';
@@ -253 +255 @@
                 // If the displayed user is marked as a spammer, 404 (unless logged-
                 // in user is a super admin)
-                if ( !empty( $bp->displayed_user->id ) && bp_core_is_user_spammer( $bp->displayed_user->id ) ) {
+                if ( bp_displayed_user_id() && bp_core_is_user_spammer( bp_displayed_user_id() ) ) {
                     if ( is_super_admin() ) {
                         bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'error' );