Changeset 5302 for trunk/bp-activity/bp-activity-template.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-activity/bp-activity-template.php (modified) (4 diffs)

trunk/bp-activity/bp-activity-template.php

@@ -115 +115 @@
 
         // Get an array of the logged in user's favorite activities
-        $this->my_favs = maybe_unserialize( bp_get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true ) );
+        $this->my_favs = maybe_unserialize( bp_get_user_meta( bp_loggedin_user_id(), 'bp_favorite_activities', true ) );
 
         // Fetch specific activity items based on ID's
@@ -273 +273 @@
         $primary_id = $bp->groups->current_group->id;
 
-        if ( 'public' != $bp->groups->current_group->status && ( groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) || $bp->loggedin_user->is_super_admin ) )
+        if ( 'public' != $bp->groups->current_group->status && ( groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) || $bp->loggedin_user->is_super_admin ) )
             $show_hidden = true;
     }
@@ -325 +325 @@
         // determine which user_id applies
         if ( empty( $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();
 
         // are we displaying user specific activity?
         if ( is_numeric( $user_id ) ) {
-            $show_hidden = ( $user_id == $bp->loggedin_user->id && $scope != 'friends' ) ? 1 : 0;
+            $show_hidden = ( $user_id == bp_loggedin_user_id() && $scope != 'friends' ) ? 1 : 0;
 
             switch ( $scope ) {
@@ -1225 +1225 @@
         $can_delete = true;
 
-    if ( $activity->user_id == $bp->loggedin_user->id )
+    if ( $activity->user_id == bp_loggedin_user_id() )
         $can_delete = true;