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

trunk/bp-groups/bp-groups-template.php

@@ -111 +111 @@
         $this->pag_num  = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
 
-        if ( $bp->loggedin_user->is_super_admin || ( is_user_logged_in() && $user_id == $bp->loggedin_user->id ) )
+        if ( $bp->loggedin_user->is_super_admin || ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) )
             $show_hidden = true;
 
@@ -309 +309 @@
         return true;
     } else {
-        if ( groups_is_user_member( $bp->loggedin_user->id, $group->id ) ) {
+        if ( groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
             return true;
         }
@@ -1394 +1394 @@
 
     if ( !$user_id )
-        $user_id = $bp->loggedin_user->id;
+        $user_id = bp_loggedin_user_id();
 
     return apply_filters( 'bp_group_is_user_banned', groups_is_user_banned( $user_id, $group->id ) );
@@ -1468 +1468 @@
         $group =& $groups_template->group;
 
-    if ( !friends_check_user_has_friends( $bp->loggedin_user->id ) || !friends_count_invitable_friends( $bp->loggedin_user->id, $group->id ) )
+    if ( !friends_check_user_has_friends( bp_loggedin_user_id() ) || !friends_count_invitable_friends( bp_loggedin_user_id(), $group->id ) )
         return false;
 
@@ -1524 +1524 @@
             // Stop sole admins from abandoning their group
             $group_admins = groups_get_group_admins( $group->id );
-            if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == $bp->loggedin_user->id )
+            if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == bp_loggedin_user_id() )
                 return false;
 
@@ -2228 +2228 @@
             $group_id = !empty( $bp->groups->new_group_id ) ? $bp->groups->new_group_id : $bp->groups->current_group->id;
 
-        if ( $friends = friends_get_friends_invite_list( $bp->loggedin_user->id, $group_id ) ) {
-            $invites = groups_get_invites_for_group( $bp->loggedin_user->id, $group_id );
+        if ( $friends = friends_get_friends_invite_list( bp_loggedin_user_id(), $group_id ) ) {
+            $invites = groups_get_invites_for_group( bp_loggedin_user_id(), $group_id );
 
             for ( $i = 0, $count = count( $friends ); $i < $count; ++$i ) {
@@ -2640 +2640 @@
     $defaults = array(
         'group_id' => false,
-        'user_id' => $bp->loggedin_user->id
+        'user_id' => bp_loggedin_user_id()
     );