Changeset 5302 for trunk/bp-friends/bp-friends-functions.php

Timestamp:

11/08/2011 01:24:47 AM (13 years ago)

Author:

johnjamesjacoby

Message:

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

File:

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

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

@@ -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' ) ) {
@@ -211 +211 @@
 
     if ( !$user_id )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
 
     if ( bp_has_members( 'user_id=' . $user_id . '&type=alphabetical&per_page=0' ) ) {