Changeset 5301 for trunk/bp-friends/bp-friends-functions.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-friends/bp-friends-functions.php (modified) (2 diffs)

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