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

Timestamp:

11/08/2011 01:24:47 AM (12 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-template.php (modified) (7 diffs)

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

@@ -291 +291 @@
         $user_id = bp_get_potential_friend_id( $user_id );
 
-    if ( $bp->loggedin_user->id == $user_id )
+    if ( bp_loggedin_user_id() == $user_id )
         return false;
 
-    return apply_filters( 'bp_is_friend', friends_check_friendship_status( $bp->loggedin_user->id, $user_id ), $user_id );
+    return apply_filters( 'bp_is_friend', friends_check_friendship_status( bp_loggedin_user_id(), $user_id ), $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 );
@@ -382 +382 @@
     global $bp;
 
-    return apply_filters( 'bp_get_friendship_requests', implode( ',', (array) friends_get_friendship_request_user_ids( $bp->loggedin_user->id ) ) );
+    return apply_filters( 'bp_get_friendship_requests', implode( ',', (array) friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) ) );
 }
 
@@ -391 +391 @@
         global $members_template, $bp;
 
-        if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id ) ) {
-            $friendship_id = friends_get_friendship_id( $members_template->member->id, $bp->loggedin_user->id );
-            wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id, $friendship_id, 'bp' );
+        if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
+            $friendship_id = friends_get_friendship_id( $members_template->member->id, bp_loggedin_user_id() );
+            wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), $friendship_id, 'bp' );
         }
 
@@ -405 +405 @@
         global $members_template, $bp;
 
-        if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id ) ) {
-            $friendship_id = friends_get_friendship_id( $members_template->member->id, $bp->loggedin_user->id );
-            wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id, $friendship_id, 'bp' );
+        if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
+            $friendship_id = friends_get_friendship_id( $members_template->member->id, bp_loggedin_user_id() );
+            wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), $friendship_id, 'bp' );
         }
 
@@ -419 +419 @@
         global $members_template, $bp;
 
-        if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id ) ) {
-            $friendship_id = friends_get_friendship_id( $members_template->member->id, $bp->loggedin_user->id );
-            wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id, $friendship_id, 'bp' );
+        if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id() ) ) {
+            $friendship_id = friends_get_friendship_id( $members_template->member->id, bp_loggedin_user_id() );
+            wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . bp_loggedin_user_id(), $friendship_id, 'bp' );
         }
 
@@ -442 +442 @@
 
         if ( empty( $user_id ) )
-            $user_id = $bp->loggedin_user->id;
+            $user_id = bp_loggedin_user_id();
 
         return apply_filters( 'bp_friend_get_total_requests_count', count( BP_Friends_Friendship::get_friend_user_ids( $user_id, true ) ) );