Changeset 5301

Timestamp:

11/08/2011 01:14:31 AM (15 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.

Location:

trunk

Files:

• bp-activity/bp-activity-functions.php (modified) (2 diffs)
• bp-activity/bp-activity-loader.php (modified) (2 diffs)
• bp-activity/bp-activity-screens.php (modified) (2 diffs)
• bp-activity/bp-activity-template.php (modified) (5 diffs)
• bp-activity/feeds/bp-activity-favorites-feed.php (modified) (1 diff)
• bp-activity/feeds/bp-activity-mentions-feed.php (modified) (1 diff)
• bp-activity/feeds/bp-activity-personal-feed.php (modified) (1 diff)
• bp-blogs/bp-blogs-classes.php (modified) (4 diffs)
• bp-blogs/bp-blogs-functions.php (modified) (1 diff)
• bp-blogs/bp-blogs-loader.php (modified) (1 diff)
• bp-blogs/bp-blogs-template.php (modified) (1 diff)
• bp-core/bp-core-avatars.php (modified) (2 diffs)
• bp-core/bp-core-catchuri.php (modified) (2 diffs)
• bp-core/bp-core-template.php (modified) (3 diffs)
• bp-core/deprecated/1.5.php (modified) (1 diff)
• bp-forums/bp-forums-functions.php (modified) (1 diff)
• bp-forums/bp-forums-loader.php (modified) (2 diffs)
• bp-forums/bp-forums-template.php (modified) (1 diff)
• bp-friends/bp-friends-classes.php (modified) (2 diffs)
• bp-friends/bp-friends-functions.php (modified) (2 diffs)
• bp-friends/bp-friends-loader.php (modified) (1 diff)
• bp-friends/bp-friends-screens.php (modified) (1 diff)
• bp-friends/bp-friends-template.php (modified) (4 diffs)
• bp-groups/bp-groups-classes.php (modified) (2 diffs)
• bp-groups/bp-groups-functions.php (modified) (2 diffs)
• bp-groups/bp-groups-loader.php (modified) (1 diff)
• bp-groups/bp-groups-screens.php (modified) (1 diff)
• bp-groups/bp-groups-template.php (modified) (2 diffs)
• bp-members/bp-members-actions.php (modified) (2 diffs)
• bp-members/bp-members-adminbar.php (modified) (1 diff)
• bp-members/bp-members-buddybar.php (modified) (2 diffs)
• bp-members/bp-members-functions.php (modified) (3 diffs)
• bp-members/bp-members-loader.php (modified) (3 diffs)
• bp-members/bp-members-template.php (modified) (8 diffs)
• bp-messages/bp-messages-loader.php (modified) (1 diff)
• bp-messages/bp-messages-screens.php (modified) (1 diff)
• bp-messages/bp-messages-template.php (modified) (2 diffs)
• bp-settings/bp-settings-actions.php (modified) (4 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-actions.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-activity.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (4 diffs)
• bp-xprofile/bp-xprofile-functions.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-loader.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-screens.php (modified) (3 diffs)
• bp-xprofile/bp-xprofile-template.php (modified) (4 diffs)

trunk/bp-activity/bp-activity-functions.php

@@ -251 +251 @@
         // Fallback to logged in user if no user_id is passed
         if ( empty( $user_id ) )
-                $user_id = $bp->displayed_user->id;
+                $user_id = bp_displayed_user_id();
 
         // Get favorites for user
@@ -431 +431 @@
         // Fallback on displayed user, and then logged in user
         if ( empty( $user_id ) )
-                $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+                $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
 
         return BP_Activity_Activity::total_favorite_count( $user_id );

trunk/bp-activity/bp-activity-loader.php

@@ -124 +124 @@
 
                 // Stop if there is no user displayed or logged in
-                if ( !is_user_logged_in() && !isset( $bp->displayed_user->id ) )
+                if ( !is_user_logged_in() && !bp_displayed_user_id() )
                         return;
 
@@ -308 +308 @@
                         } else {
                                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                                        'item_id' => $bp->displayed_user->id,
+                                        'item_id' => bp_displayed_user_id(),
                                         'type'    => 'thumb'
                                 ) );

trunk/bp-activity/bp-activity-screens.php

@@ -268 +268 @@
         global $bp;
 
-        if ( !$mention = bp_get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) )
+        if ( !$mention = bp_get_user_meta( bp_displayed_user_id(), 'notification_activity_new_mention', true ) )
                 $mention = 'yes';
 
-        if ( !$reply = bp_get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true ) )
+        if ( !$reply = bp_get_user_meta( bp_displayed_user_id(), 'notification_activity_new_reply', true ) )
                 $reply = 'yes'; ?>
 
@@ -287 +287 @@
                         <tr id="activity-notification-settings-mentions">
                                 <td>&nbsp;</td>
-                                <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) ?></td>
+                                <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( bp_displayed_user_id(), $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) ?></td>
                                 <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php checked( $mention, 'yes', true ) ?>/></td>
                                 <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php checked( $mention, 'no', true ) ?>/></td>

trunk/bp-activity/bp-activity-template.php

@@ -265 +265 @@
 
         // User filtering
-        if ( !empty( $bp->displayed_user->id ) )
-                $user_id = $bp->displayed_user->id;
+        if ( bp_displayed_user_id() )
+                $user_id = bp_displayed_user_id();
 
         // Group filtering
@@ -325 +325 @@
                 // determine which user_id applies
                 if ( empty( $user_id ) )
-                        $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+                        $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
 
                 // are we displaying user specific activity?
@@ -361 +361 @@
                                         break;
                                 case 'mentions':
-                                        $user_nicename    = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->userdata->user_nicename : $bp->loggedin_user->userdata->user_nicename;
-                                        $user_login       = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
+                                        $user_nicename    = ( bp_displayed_user_id() ) ? $bp->displayed_user->userdata->user_nicename : $bp->loggedin_user->userdata->user_nicename;
+                                        $user_login       = ( bp_displayed_user_id() ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
                                         $search_terms     = '@' . bp_core_get_username( $user_id, $user_nicename, $user_login ) . '<'; // Start search at @ symbol and stop search at closing tag delimiter.
                                         $display_comments = 'stream';
@@ -2044 +2044 @@
 
                 if ( !$user_id )
-                        $user_id = $bp->displayed_user->id;
+                        $user_id = bp_displayed_user_id();
 
                 if ( bp_core_is_user_spammer( $user_id ) || bp_core_is_user_deleted( $user_id ) )
@@ -2310 +2310 @@
                         return false;
 
-                return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_activity_slug() . '/?r=' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
+                return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_activity_slug() . '/?r=' . bp_core_get_username( bp_displayed_user_id(), $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
         }
 

trunk/bp-activity/feeds/bp-activity-favorites-feed.php

@@ -36 +36 @@
 
         <?php
-                $favs = bp_activity_get_user_favorites( $bp->displayed_user->id );
+                $favs = bp_activity_get_user_favorites( bp_displayed_user_id() );
                 $fav_ids = implode( ',', (array)$favs );
         ?>

trunk/bp-activity/feeds/bp-activity-mentions-feed.php

@@ -34 +34 @@
         <?php do_action('bp_activity_mentions_feed_head'); ?>
 
-        <?php if ( bp_has_activities( 'max=50&display_comments=stream&search_terms=@' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) ) : ?>
+        <?php if ( bp_has_activities( 'max=50&display_comments=stream&search_terms=@' . bp_core_get_username( bp_displayed_user_id(), $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) ) : ?>
                 <?php while ( bp_activities() ) : bp_the_activity(); ?>
                         <item>

trunk/bp-activity/feeds/bp-activity-personal-feed.php

@@ -34 +34 @@
         <?php do_action('bp_activity_personal_feed_head'); ?>
 
-        <?php if ( bp_has_activities( 'user_id=' . $bp->displayed_user->id . '&max=50&display_comments=stream' ) ) : ?>
+        <?php if ( bp_has_activities( 'user_id=' . bp_displayed_user_id() . '&max=50&display_comments=stream' ) ) : ?>
                 <?php while ( bp_activities() ) : bp_the_activity(); ?>
                         <item>

trunk/bp-blogs/bp-blogs-classes.php

@@ -15 +15 @@
                 global $bp, $wpdb;
 
-                $user_id = $bp->displayed_user->id;
+                $user_id = bp_displayed_user_id();
 
                 if ( $id ) {
@@ -151 +151 @@
 
                 if ( !$user_id )
-                        $user_id = $bp->displayed_user->id;
+                        $user_id = bp_displayed_user_id();
 
                 // Show logged in users their hidden blogs.
@@ -177 +177 @@
 
                 if ( !$user_id )
-                        $user_id = $bp->displayed_user->id;
+                        $user_id = bp_displayed_user_id();
 
                 return $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$bp->blogs->table_name} WHERE user_id = %d", $user_id ) );
@@ -192 +192 @@
 
                 if ( !$user_id )
-                        $user_id = $bp->displayed_user->id;
+                        $user_id = bp_displayed_user_id();
 
                 // If the user is logged in return the blog count including their hidden blogs.

trunk/bp-blogs/bp-blogs-functions.php

@@ -411 +411 @@
 
         if ( !$user_id )
-                $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+                $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
 
         if ( !$count = wp_cache_get( 'bp_total_blogs_for_user_' . $user_id, 'bp' ) ) {

trunk/bp-blogs/bp-blogs-loader.php

@@ -182 +182 @@
                         } else {
                                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                                        'item_id' => $bp->displayed_user->id,
+                                        'item_id' => bp_displayed_user_id(),
                                         'type'    => 'thumb'
                                 ) );

trunk/bp-blogs/bp-blogs-template.php

@@ -204 +204 @@
 
         /* User filtering */
-        if ( !empty( $bp->displayed_user->id ) )
-                $user_id = $bp->displayed_user->id;
+        if ( bp_displayed_user_id() )
+                $user_id = bp_displayed_user_id();
 
         $defaults = array(

trunk/bp-core/bp-core-avatars.php

@@ -115 +115 @@
         if ( !$item_id ) {
                 if ( 'user' == $object )
-                        $item_id = $bp->displayed_user->id;
+                        $item_id = bp_displayed_user_id();
                 else if ( bp_is_active( 'groups' ) && 'group' == $object )
                         $item_id = $bp->groups->current_group->id;
@@ -327 +327 @@
         if ( !$item_id ) {
                 if ( 'user' == $object )
-                        $item_id = $bp->displayed_user->id;
+                        $item_id = bp_displayed_user_id();
                 else if ( 'group' == $object )
                         $item_id = $bp->groups->current_group->id;

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' );

trunk/bp-core/bp-core-template.php

@@ -200 +200 @@
                 $youtext = bp_core_ucfirst($youtext);
 
-        if ( $bp->displayed_user->id == $bp->loggedin_user->id ) {
+        if ( bp_displayed_user_id() == $bp->loggedin_user->id ) {
                 if ( $echo )
                         echo apply_filters( 'bp_word_or_name', $youtext );
@@ -1083 +1083 @@
         global $bp;
 
-        if ( is_user_logged_in() && $bp->loggedin_user->id == $bp->displayed_user->id )
+        if ( is_user_logged_in() && $bp->loggedin_user->id == bp_displayed_user_id() )
                 $my_profile = true;
         else
@@ -1094 +1094 @@
         global $bp;
 
-        if ( !empty( $bp->displayed_user->id ) )
+        if ( bp_displayed_user_id() )
                 return true;
 

trunk/bp-core/deprecated/1.5.php

@@ -130 +130 @@
         global $bp;
 
-        $ud = get_userdata( $bp->displayed_user->id ); ?>
+        $ud = get_userdata( bp_displayed_user_id() ); ?>
 
 <div class="bp-widget wp-profile">

trunk/bp-forums/bp-forums-functions.php

@@ -316 +316 @@
 
         if ( !$user_id )
-                $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+                $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
 
         if ( class_exists( 'BB_Query' ) ) {

trunk/bp-forums/bp-forums-loader.php

@@ -104 +104 @@
 
                 // Stop if there is no user displayed or logged in
-                if ( !is_user_logged_in() && !isset( $bp->displayed_user->id ) )
+                if ( !is_user_logged_in() && !bp_displayed_user_id() )
                         return;
 
@@ -238 +238 @@
                         } else {
                                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                                        'item_id' => $bp->displayed_user->id,
+                                        'item_id' => bp_displayed_user_id(),
                                         'type'    => 'thumb'
                                 ) );

trunk/bp-forums/bp-forums-template.php

@@ -269 +269 @@
 
         // User filtering
-        if ( !empty( $bp->displayed_user->id ) )
-                $user_id = $bp->displayed_user->id;
+        if ( bp_displayed_user_id() )
+                $user_id = bp_displayed_user_id();
 
         // "Replied" query must be manually modified

trunk/bp-friends/bp-friends-classes.php

@@ -42 +42 @@
 
                 // if running from ajax.
-                if ( !$bp->displayed_user->id )
+                if ( !bp_displayed_user_id() )
                         $bp->displayed_user->id = $creds['current_userid'];
 
                 if ( $this->populate_friend_details ) {
-                        if ( $this->friend_user_id == $bp->displayed_user->id ) {
+                        if ( $this->friend_user_id == bp_displayed_user_id() ) {
                                 $this->friend = new BP_Core_User( $this->initiator_user_id );
                         } else {
@@ -127 +127 @@
 
                 if ( !$user_id )
-                        $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+                        $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
 
                 /* This is stored in 'total_friend_count' usermeta.

trunk/bp-friends/bp-friends-functions.php

@@ -58 +58 @@
 
         // Remove the activity stream item for the user who canceled the friendship
-        friends_delete_activity( array( 'item_id' => $friendship_id, 'type' => 'friendship_accepted', 'user_id' => $bp->displayed_user->id ) );
+        friends_delete_activity( array( 'item_id' => $friendship_id, 'type' => 'friendship_accepted', 'user_id' => bp_displayed_user_id() ) );
 
         do_action( 'friends_friendship_deleted', $friendship_id, $initiator_userid, $friend_userid );
@@ -152 +152 @@
 
         if ( !$user_id )
-                $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+                $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
 
         if ( !$count = wp_cache_get( 'bp_total_friend_count_' . $user_id, 'bp' ) ) {

trunk/bp-friends/bp-friends-loader.php

@@ -197 +197 @@
                         } else {
                                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                                        'item_id' => $bp->displayed_user->id,
+                                        'item_id' => bp_displayed_user_id(),
                                         'type'    => 'thumb'
                                 ) );

trunk/bp-friends/bp-friends-screens.php

@@ -55 +55 @@
         global $bp;
 
-        if ( !$send_requests = bp_get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true ) )
+        if ( !$send_requests = bp_get_user_meta( bp_displayed_user_id(), 'notification_friends_friendship_request', true ) )
                 $send_requests   = 'yes';
 
-        if ( !$accept_requests = bp_get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true ) )
+        if ( !$accept_requests = bp_get_user_meta( bp_displayed_user_id(), 'notification_friends_friendship_accepted', true ) )
                 $accept_requests = 'yes';
 ?>

trunk/bp-friends/bp-friends-template.php

@@ -93 +93 @@
         global $bp;
 
-        if ( !$friend_ids = wp_cache_get( 'friends_friend_ids_' . $bp->displayed_user->id, 'bp' ) ) {
-                $friend_ids = BP_Friends_Friendship::get_random_friends( $bp->displayed_user->id );
-                wp_cache_set( 'friends_friend_ids_' . $bp->displayed_user->id, $friend_ids, 'bp' );
+        if ( !$friend_ids = wp_cache_get( 'friends_friend_ids_' . bp_displayed_user_id(), 'bp' ) ) {
+                $friend_ids = BP_Friends_Friendship::get_random_friends( bp_displayed_user_id() );
+                wp_cache_set( 'friends_friend_ids_' . bp_displayed_user_id(), $friend_ids, 'bp' );
         } ?>
 
         <div class="info-group">
-                <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?>  (<?php echo BP_Friends_Friendship::total_friend_count( $bp->displayed_user->id ) ?>) <span><a href="<?php echo $bp->displayed_user->domain . bp_get_friends_slug() ?>"><?php _e('See All', 'buddypress') ?></a></span></h4>
+                <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?>  (<?php echo BP_Friends_Friendship::total_friend_count( bp_displayed_user_id() ) ?>) <span><a href="<?php echo $bp->displayed_user->domain . bp_get_friends_slug() ?>"><?php _e('See All', 'buddypress') ?></a></span></h4>
 
                 <?php if ( $friend_ids ) { ?>
@@ -208 +208 @@
                         <?php wp_nonce_field( 'friends_search', '_wpnonce_friend_search' ) ?>
 
-                        <input type="hidden" name="initiator" id="initiator" value="<?php echo esc_attr( $bp->displayed_user->id ) ?>" />
+                        <input type="hidden" name="initiator" id="initiator" value="<?php echo esc_attr( bp_displayed_user_id() ) ?>" />
 
                 </form>
@@ -268 +268 @@
                         $user_id = $friends_template->friendship->friend->id;
                 else if ( empty( $user_id ) && !isset( $friends_template->friendship->friend ) )
-                        $user_id = $bp->displayed_user->id;
+                        $user_id = bp_displayed_user_id();
 
                 return apply_filters( 'bp_get_potential_friend_id', (int)$user_id );
@@ -370 +370 @@
 
         if ( !$user_id )
-                $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+                $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
 
         $friend_ids = friends_get_friend_user_ids( $user_id );

trunk/bp-groups/bp-groups-classes.php

@@ -176 +176 @@
 
                 if ( !$user_id )
-                        $user_id = $bp->displayed_user->id;
+                        $user_id = bp_displayed_user_id();
 
                 $filter = like_escape( $wpdb->escape( $filter ) );
@@ -937 +937 @@
 
                 if ( !$user_id )
-                        $user_id = $bp->displayed_user->id;
+                        $user_id = bp_displayed_user_id();
 
                 if ( $user_id != $bp->loggedin_user->id && !is_super_admin() ) {

trunk/bp-groups/bp-groups-functions.php

@@ -398 +398 @@
 
         if ( !$user_id )
-                $user_id = $bp->displayed_user->id;
+                $user_id = bp_displayed_user_id();
 
         return BP_Groups_Member::get_group_ids( $user_id, $pag_num, $pag_page );
@@ -407 +407 @@
 
         if ( !$user_id )
-                $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+                $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
 
         if ( !$count = wp_cache_get( 'bp_total_groups_for_user_' . $user_id, 'bp' ) ) {

trunk/bp-groups/bp-groups-loader.php

@@ -448 +448 @@
 
                                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                                        'item_id' => $bp->displayed_user->id,
+                                        'item_id' => bp_displayed_user_id(),
                                         'type'    => 'thumb'
                                 ) );

trunk/bp-groups/bp-groups-screens.php

@@ -812 +812 @@
         global $bp;
 
-        if ( !$group_invite = bp_get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true ) )
+        if ( !$group_invite = bp_get_user_meta( bp_displayed_user_id(), 'notification_groups_invite', true ) )
                 $group_invite  = 'yes';
 
-        if ( !$group_update = bp_get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true ) )
+        if ( !$group_update = bp_get_user_meta( bp_displayed_user_id(), 'notification_groups_group_updated', true ) )
                 $group_update  = 'yes';
 
-        if ( !$group_promo = bp_get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true ) )
+        if ( !$group_promo = bp_get_user_meta( bp_displayed_user_id(), 'notification_groups_admin_promotion', true ) )
                 $group_promo   = 'yes';
 
-        if ( !$group_request = bp_get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true ) )
+        if ( !$group_request = bp_get_user_meta( bp_displayed_user_id(), 'notification_groups_membership_request', true ) )
                 $group_request = 'yes';
 ?>

trunk/bp-groups/bp-groups-template.php

@@ -238 +238 @@
 
         // User filtering
-        if ( !empty( $bp->displayed_user->id ) )
-                $user_id = $bp->displayed_user->id;
+        if ( bp_displayed_user_id() )
+                $user_id = bp_displayed_user_id();
 
         // Type
@@ -698 +698 @@
 
 function bp_group_show_no_groups_message() {
-        global $bp;
-
-        if ( !groups_total_groups_for_user( $bp->displayed_user->id ) )
+        if ( !groups_total_groups_for_user( bp_displayed_user_id() ) )
                 return true;
 

trunk/bp-members/bp-members-actions.php

@@ -123 +123 @@
         global $bp;
 
-        if ( !is_super_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
+        if ( !is_super_admin() || bp_is_my_profile() || !bp_displayed_user_id() )
                 return false;
 
@@ -133 +133 @@
                 do_action( 'bp_core_before_action_delete_user', $errors );
 
-                if ( bp_core_delete_account( $bp->displayed_user->id ) ) {
+                if ( bp_core_delete_account( bp_displayed_user_id() ) ) {
                         bp_core_add_message( sprintf( __( '%s has been deleted from the system.', 'buddypress' ), $bp->displayed_user->fullname ) );
                 } else {

trunk/bp-members/bp-members-adminbar.php

@@ -109 +109 @@
         // User avatar
         $avatar = bp_core_fetch_avatar( array(
-                'item_id' => $bp->displayed_user->id,
+                'item_id' => bp_displayed_user_id(),
                 'email'   => $bp->displayed_user->userdata->user_email,
                 'width'   => 16,

trunk/bp-members/bp-members-buddybar.php

@@ -92 +92 @@
 
         // Only show if viewing a user
-        if ( !$bp->displayed_user->id )
+        if ( !bp_displayed_user_id() )
                 return false;
 
@@ -112 +112 @@
                         <li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ) ?></a></li>
 
-                        <?php if ( !bp_core_is_user_spammer( $bp->displayed_user->id ) ) : ?>
+                        <?php if ( !bp_core_is_user_spammer( bp_displayed_user_id() ) ) : ?>
 
                                 <li><a href="<?php echo wp_nonce_url( $bp->displayed_user->domain . 'admin/mark-spammer/', 'mark-unmark-spammer' ) ?>" class="confirm"><?php printf( __( "Mark as Spammer", 'buddypress' ), esc_attr( $bp->displayed_user->fullname ) ); ?></a></li>

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

@@ -218 +218 @@
 
                         // User ID matches displayed in user
-                        } elseif ( isset( $bp->displayed_user->id ) && $bp->displayed_user->id == $user_id ) {
+                        } elseif ( bp_displayed_user_id() == $user_id ) {
                                 $userdata = &$bp->displayed_user->userdata;
 
@@ -290 +290 @@
 
                 // User ID matches displayed in user
-                } elseif ( isset( $bp->displayed_user->id ) && $bp->displayed_user->id == $user_id ) {
+                } elseif ( bp_displayed_user_id() == $user_id ) {
                         $userdata = &$bp->displayed_user->userdata;
 
@@ -576 +576 @@
 
         if ( empty( $user_id ) )
-                $user_id = $bp->displayed_user->id;
+                $user_id = bp_displayed_user_id();
 
         return apply_filters( 'bp_core_get_all_posts_for_user', $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_status = 'publish' AND post_type = 'post'", $user_id ) ) );

trunk/bp-members/bp-members-loader.php

@@ -89 +89 @@
                 /** Displayed user ****************************************************/
 
-                // The user id of the user currently being viewed:
-                // $bp->displayed_user->id is set in /bp-core/bp-core-catchuri.php
-                if ( empty( $bp->displayed_user->id ) )
-                        $bp->displayed_user->id = 0;
-
                 // The domain for the user currently being displayed
-                $bp->displayed_user->domain   = bp_core_get_user_domain( $bp->displayed_user->id );
+                $bp->displayed_user->domain   = bp_core_get_user_domain( bp_displayed_user_id() );
 
                 // The core userdata of the user who is currently being displayed
-                $bp->displayed_user->userdata = bp_core_get_core_userdata( $bp->displayed_user->id );
+                $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
 
                 // Fetch the full name displayed user
-                $bp->displayed_user->fullname = bp_core_get_user_displayname( $bp->displayed_user->id );
+                $bp->displayed_user->fullname = bp_core_get_user_displayname( bp_displayed_user_id() );
 
                 /** Profiles Fallback *************************************************/
@@ -120 +115 @@
                 }
 
-                if ( !$bp->current_component && $bp->displayed_user->id )
+                if ( !$bp->current_component && bp_displayed_user_id() )
                         $bp->current_component = $bp->default_component;
         }
@@ -178 +173 @@
                 } elseif( bp_is_user() ) {
                         $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                                'item_id' => $bp->displayed_user->id,
+                                'item_id' => bp_displayed_user_id(),
                                 'type'    => 'thumb'
                         ) );

trunk/bp-members/bp-members-template.php

@@ -282 +282 @@
 
         // User filtering
-        if ( !empty( $bp->displayed_user->id ) )
-                $user_id = $bp->displayed_user->id;
+        if ( bp_displayed_user_id() )
+                $user_id = bp_displayed_user_id();
 
         // type: active ( default ) | random | newest | popular | online | alphabetical
@@ -610 +610 @@
                 if ( !empty( $members_template->member->id ) )
                         $user_id = $members_template->member->id;
-                elseif ( !empty( $bp->displayed_user->id ) )
-                        $user_id = $bp->displayed_user->id;
+                elseif ( bp_displayed_user_id() )
+                        $user_id = bp_displayed_user_id();
 
                 $defaults = array(
@@ -716 +716 @@
                    then check to see if the two users are friends. if they are, add a highlight CSS class
                    to the friends nav item if it exists. */
-                if ( !bp_is_my_profile() && $bp->displayed_user->id ) {
+                if ( !bp_is_my_profile() && bp_displayed_user_id() ) {
                         $selected = '';
 
                         if ( bp_is_active( 'friends' ) ) {
                                 if ( $nav_item['css_id'] == $bp->friends->id ) {
-                                        if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) )
+                                        if ( friends_check_friendship( $bp->loggedin_user->id, bp_displayed_user_id() ) )
                                                 $selected = ' class="current selected"';
                                 }
@@ -804 +804 @@
                 extract( $r, EXTR_SKIP );
 
-                return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
+                return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( array( 'item_id' => bp_displayed_user_id(), 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
         }
 
@@ -829 +829 @@
 
                 if ( empty( $user_id ) )
-                        $user_id = $bp->displayed_user->id;
+                        $user_id = bp_displayed_user_id();
 
                 $last_activity = bp_core_get_last_activity( bp_get_user_meta( $user_id, 'last_activity', true ), __('active %s', 'buddypress') );
@@ -871 +871 @@
 
 function bp_displayed_user_id() {
-        global $bp;
-        return apply_filters( 'bp_displayed_user_id', !empty( $bp->displayed_user->id ) ? $bp->displayed_user->id : 0 );
+        
+        static $id = 0;
+        
+        if ( empty( $id ) ) {
+                global $bp;
+                $id = !empty( $bp->displayed_user->id ) ? $bp->displayed_user->id : 0;
+        }
+
+        return apply_filters( 'bp_displayed_user_id', $id );
 }
         function bp_current_user_id() { return bp_displayed_user_id(); }
 
 function bp_loggedin_user_id() {
-        global $bp;
-        return apply_filters( 'bp_loggedin_user_id', !empty( $bp->loggedin_user->id ) ? $bp->loggedin_user->id : 0 );
+
+        static $id = 0;
+        
+        if ( empty( $id ) ) {
+                global $bp;
+                $id = !empty( $bp->loggedin_user->id ) ? $bp->loggedin_user->id : 0;
+        }
+
+        return apply_filters( 'bp_loggedin_user_id', $id );
 }
 
@@ -915 +929 @@
                 global $bp;
 
-                if ( !empty( $bp->displayed_user->id ) ) {
-                        $username = bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login );
+                if ( bp_displayed_user_id() ) {
+                        $username = bp_core_get_username( bp_displayed_user_id(), $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login );
                 } else {
                         $username = '';
@@ -1171 +1185 @@
 
                 // Must be displayed user
-                if ( empty( $bp->displayed_user->id ) )
+                if ( !bp_displayed_user_id() )
                         return;
 

trunk/bp-messages/bp-messages-loader.php

@@ -242 +242 @@
                         } else {
                                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                                        'item_id' => $bp->displayed_user->id,
+                                        'item_id' => bp_displayed_user_id(),
                                         'type'    => 'thumb'
                                 ) );

trunk/bp-messages/bp-messages-screens.php

@@ -136 +136 @@
         }
 
-        if ( !$new_messages = bp_get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true ) )
+        if ( !$new_messages = bp_get_user_meta( bp_displayed_user_id(), 'notification_messages_new_message', true ) )
                 $new_messages = 'yes';
 
-        if ( !$new_notices = bp_get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true ) )
+        if ( !$new_notices = bp_get_user_meta( bp_displayed_user_id(), 'notification_messages_new_notice', true ) )
                 $new_notices  = 'yes';
 ?>

trunk/bp-messages/bp-messages-template.php

@@ -171 +171 @@
 
         if ( 'notices' == $bp->current_action && !is_super_admin() ) {
-                wp_redirect( $bp->displayed_user->id );
+                wp_redirect( bp_displayed_user_id() );
         } else {
                 if ( 'inbox' == $bp->current_action )
@@ -562 +562 @@
                         return false;
 
-                return apply_filters( 'bp_get_send_private_message_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/compose/?r=' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
+                return apply_filters( 'bp_get_send_private_message_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->messages->slug . '/compose/?r=' . bp_core_get_username( bp_displayed_user_id(), $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
         }
 

trunk/bp-settings/bp-settings-actions.php

@@ -22 +22 @@
 
                 // Validate the user again for the current password when making a big change
-                if ( is_super_admin() || ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, $bp->displayed_user->id ) ) ) {
+                if ( is_super_admin() || ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, bp_displayed_user_id() ) ) ) {
 
-                        $update_user = get_userdata( $bp->displayed_user->id );
+                        $update_user = get_userdata( bp_displayed_user_id() );
 
                         // Make sure changing an email address does not already exist
@@ -83 +83 @@
                         // Make sure these changes are in $bp for the current page load
                         if ( ( false === $email_error ) && ( false === $pass_error ) && ( wp_update_user( get_object_vars( $update_user ) ) ) ) {
-                                $bp->displayed_user->userdata = bp_core_get_core_userdata( $bp->displayed_user->id );
+                                $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
                                 $bp_settings_updated = true;
                         }
@@ -129 +129 @@
                         foreach ( (array)$_POST['notifications'] as $key => $value ) {
                                 if ( $meta_key = bp_get_user_meta_key( $key ) )
-                                        bp_update_user_meta( (int)$bp->displayed_user->id, $meta_key, $value );
+                                        bp_update_user_meta( (int)bp_displayed_user_id(), $meta_key, $value );
                         }
                 }
@@ -156 +156 @@
 
                 // delete the users account
-                if ( bp_core_delete_account( $bp->displayed_user->id ) ) {
+                if ( bp_core_delete_account( bp_displayed_user_id() ) ) {
                         bp_core_redirect( home_url() );
                 }

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -40 +40 @@
         if ( !empty( $_BP_COOKIE['bp-' . $object . '-scope'] ) ) {
                 if ( 'personal' == $_BP_COOKIE['bp-' . $object . '-scope'] ) {
-                        $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
+                        $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : $bp->loggedin_user->id;
                         $qs[] = 'user_id=' . $user_id;
                 }
-                if ( 'all' != $_BP_COOKIE['bp-' . $object . '-scope'] && empty( $bp->displayed_user->id ) && !$bp->is_single_item )
+                if ( 'all' != $_BP_COOKIE['bp-' . $object . '-scope'] && !bp_displayed_user_id() && !$bp->is_single_item )
                         $qs[] = 'scope=' . $_BP_COOKIE['bp-' . $object . '-scope']; // Activity stream scope only on activity directory.
         }

trunk/bp-xprofile/bp-xprofile-actions.php

@@ -33 +33 @@
                 return false;
 
-        if ( bp_core_delete_existing_avatar( array( 'item_id' => $bp->displayed_user->id ) ) )
+        if ( bp_core_delete_existing_avatar( array( 'item_id' => bp_displayed_user_id() ) ) )
                 bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
         else

trunk/bp-xprofile/bp-xprofile-activity.php

@@ -120 +120 @@
                 return false;
 
-        $user_id = apply_filters( 'bp_xprofile_new_avatar_user_id', $bp->displayed_user->id );
+        $user_id = apply_filters( 'bp_xprofile_new_avatar_user_id', bp_displayed_user_id() );
 
         $userlink = bp_core_get_userlink( $user_id );

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -113 +113 @@
                 $defaults = array(
                         'profile_group_id'  => false,
-                        'user_id'           => $bp->displayed_user->id,
+                        'user_id'           => bp_displayed_user_id(),
                         'hide_empty_groups' => false,
                         'hide_empty_fields' => false,
@@ -945 +945 @@
 
                 if ( !$user_ids )
-                        $user_ids = $bp->displayed_user->id;
+                        $user_ids = bp_displayed_user_id();
 
                 if ( is_array( $user_ids ) ) {
@@ -964 +964 @@
 
                 if ( !$user_id )
-                        $user_id = $bp->displayed_user->id;
+                        $user_id = bp_displayed_user_id();
 
                 $field_sql = '';
@@ -1040 +1040 @@
 
                 if ( !$user_id )
-                        $user_id = $bp->displayed_user->id;
+                        $user_id = bp_displayed_user_id();
 
                 $field_name = bp_xprofile_fullname_field_name();

trunk/bp-xprofile/bp-xprofile-functions.php

@@ -156 +156 @@
 
         if ( empty( $user_id ) )
-                $user_id = $bp->displayed_user->id;
+                $user_id = bp_displayed_user_id();
 
         if ( empty( $user_id ) )
@@ -355 +355 @@
 
         if ( empty( $user_id ) )
-                $user_id = $bp->displayed_user->id;
+                $user_id = bp_displayed_user_id();
 
         if ( empty( $directory ) )

trunk/bp-xprofile/bp-xprofile-loader.php

@@ -221 +221 @@
                         } else {
                                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                                        'item_id' => $bp->displayed_user->id,
+                                        'item_id' => bp_displayed_user_id(),
                                         'type'    => 'thumb'
                                 ) );

trunk/bp-xprofile/bp-xprofile-screens.php

@@ -99 +99 @@
                                         $value = $_POST['field_' . $field_id];
 
-                                if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $value, $is_required[$field_id] ) )
+                                if ( !xprofile_set_field_data( $field_id, bp_displayed_user_id(), $value, $is_required[$field_id] ) )
                                         $errors = true;
                                 else
@@ -105 +105 @@
                         }
 
-                        do_action( 'xprofile_updated_profile', $bp->displayed_user->id, $posted_field_ids, $errors );
+                        do_action( 'xprofile_updated_profile', bp_displayed_user_id(), $posted_field_ids, $errors );
 
                         // Set the feedback messages
@@ -162 +162 @@
                 check_admin_referer( 'bp_avatar_cropstore' );
 
-                if ( !bp_core_avatar_handle_crop( array( 'item_id' => $bp->displayed_user->id, 'original_file' => $_POST['image_src'], 'crop_x' => $_POST['x'], 'crop_y' => $_POST['y'], 'crop_w' => $_POST['w'], 'crop_h' => $_POST['h'] ) ) )
+                if ( !bp_core_avatar_handle_crop( array( 'item_id' => bp_displayed_user_id(), 'original_file' => $_POST['image_src'], 'crop_x' => $_POST['x'], 'crop_y' => $_POST['y'], 'crop_w' => $_POST['w'], 'crop_h' => $_POST['h'] ) ) )
                         bp_core_add_message( __( 'There was a problem cropping your avatar, please try uploading it again', 'buddypress' ), 'error' );
                 else {

trunk/bp-xprofile/bp-xprofile-template.php

@@ -159 +159 @@
 
         $defaults = array(
-                'user_id'           => $bp->displayed_user->id,
+                'user_id'           => bp_displayed_user_id(),
                 'profile_group_id'  => false,
                 'hide_empty_groups' => true,
@@ -689 +689 @@
                 $defaults = array(
                         'field'   => false, // Field name or ID.
-                        'user_id' => $bp->displayed_user->id
+                        'user_id' => bp_displayed_user_id()
                 );
 
@@ -774 +774 @@
                 global $bp;
 
-                $last_updated = bp_get_user_meta( $bp->displayed_user->id, 'profile_last_updated', true );
+                $last_updated = bp_get_user_meta( bp_displayed_user_id(), 'profile_last_updated', true );
 
                 if ( $last_updated )
@@ -804 +804 @@
         global $bp;
 
-        if ( !bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'no_grav' => true ) ) )
+        if ( !bp_core_fetch_avatar( array( 'item_id' => bp_displayed_user_id(), 'no_grav' => true ) ) )
                 return false;