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

Timestamp:

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

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

@@ -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.
@@ -148 +148 @@
 
                 if ( !$user_id )
-                        $user_id = $bp->loggedin_user->id;
+                        $user_id = bp_loggedin_user_id();
 
                 $filter = like_escape( $wpdb->escape( $filter ) );
@@ -210 +210 @@
                 global $wpdb, $bp;
 
-                return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = %s WHERE id = %d AND friend_user_id = %d", bp_core_current_time(), $friendship_id, $bp->loggedin_user->id ) );
+                return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->friends->table_name} SET is_confirmed = 1, date_created = %s WHERE id = %d AND friend_user_id = %d", bp_core_current_time(), $friendship_id, bp_loggedin_user_id() ) );
         }
 
@@ -216 +216 @@
                 global $wpdb, $bp;
 
-                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE id = %d AND friend_user_id = %d", $friendship_id, $bp->loggedin_user->id ) );
+                return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->friends->table_name} WHERE id = %d AND friend_user_id = %d", $friendship_id, bp_loggedin_user_id() ) );
         }