Changeset 5302 for trunk/bp-groups/bp-groups-loader.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-groups/bp-groups-loader.php (modified) (3 diffs)

trunk/bp-groups/bp-groups-loader.php

@@ -107 +107 @@
                 bp_update_is_item_admin( true, 'groups' );
             else
-                bp_update_is_item_admin( groups_is_user_admin( $bp->loggedin_user->id, $this->current_group->id ), 'groups' );
+                bp_update_is_item_admin( groups_is_user_admin( bp_loggedin_user_id(), $this->current_group->id ), 'groups' );
 
             // If the user is not an admin, check if they are a moderator
             if ( !bp_is_item_admin() )
-                bp_update_is_item_mod  ( groups_is_user_mod  ( $bp->loggedin_user->id, $this->current_group->id ), 'groups' );
+                bp_update_is_item_mod  ( groups_is_user_mod  ( bp_loggedin_user_id(), $this->current_group->id ), 'groups' );
 
             // Is the logged in user a member of the group?
-            if ( ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $this->current_group->id ) ) )
+            if ( ( is_user_logged_in() && groups_is_user_member( bp_loggedin_user_id(), $this->current_group->id ) ) )
                 $this->current_group->is_user_member = true;
             else
@@ -314 +314 @@
                  !is_super_admin() &&
                  !$this->current_group->is_user_member &&
-                 !groups_check_for_membership_request( $bp->loggedin_user->id, $this->current_group->id ) &&
+                 !groups_check_for_membership_request( bp_loggedin_user_id(), $this->current_group->id ) &&
                  $this->current_group->status == 'private'
                 ) {
@@ -393 +393 @@
 
             // Pending group invites
-            $count = groups_get_invites_for_user( $bp->loggedin_user->id );
+            $count = groups_get_invites_for_user( bp_loggedin_user_id() );
 
             if ( !empty( $count->total ) ) {