Changeset 5301 for trunk/bp-friends/bp-friends-classes.php

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.

File:

• trunk/bp-friends/bp-friends-classes.php (modified) (2 diffs)

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.