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

trunk/bp-groups/bp-groups-classes.php

@@ -42 +42 @@
             $this->last_activity      = $group->last_activity;
             $this->total_member_count = $group->total_member_count;
-            $this->is_member          = BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $this->id );
+            $this->is_member          = BP_Groups_Member::check_is_member( bp_loggedin_user_id(), $this->id );
 
             // Get group admins and mods
@@ -387 +387 @@
         }
 
-        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != bp_loggedin_user_id() ) ) )
             $hidden_sql = " AND g.status != 'hidden'";
 
@@ -428 +428 @@
         }
 
-        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != bp_loggedin_user_id() ) ) )
             $hidden_sql = " AND g.status != 'hidden'";
 
@@ -505 +505 @@
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
-        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+        if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != bp_loggedin_user_id() ) ) )
             $hidden_sql = "AND g.status != 'hidden'";
 
@@ -543 +543 @@
 
         /* Fetch the logged in users status within each group */
-        $user_status = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_confirmed = 1 AND is_banned = 0", $bp->loggedin_user->id ) );
+        $user_status = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_confirmed = 1 AND is_banned = 0", bp_loggedin_user_id() ) );
         for ( $i = 0, $count = count( $paged_groups ); $i < $count; ++$i ) {
             $paged_groups[$i]->is_member = false;
@@ -553 +553 @@
         }
 
-        $user_banned = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE is_banned = 1 AND user_id = %d AND group_id IN ( {$group_ids} )", $bp->loggedin_user->id ) );
+        $user_banned = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE is_banned = 1 AND user_id = %d AND group_id IN ( {$group_ids} )", bp_loggedin_user_id() ) );
         for ( $i = 0, $count = count( $paged_groups ); $i < $count; ++$i ) {
             $paged_groups[$i]->is_banned = false;
@@ -854 +854 @@
 
         // If the user is logged in and viewing their own groups, we can show hidden and private groups
-        if ( $user_id != $bp->loggedin_user->id ) {
+        if ( $user_id != bp_loggedin_user_id() ) {
             $group_sql = $wpdb->prepare( "SELECT DISTINCT m.group_id FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0{$pag_sql}", $user_id );
             $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id ) );
@@ -880 +880 @@
         }
 
-        if ( $user_id != $bp->loggedin_user->id )
+        if ( $user_id != bp_loggedin_user_id() )
             $hidden_sql = " AND g.status != 'hidden'";
 
@@ -902 +902 @@
         }
 
-        if ( $user_id != $bp->loggedin_user->id )
+        if ( $user_id != bp_loggedin_user_id() )
             $hidden_sql = " AND g.status != 'hidden'";
 
@@ -924 +924 @@
         }
 
-        if ( $user_id != $bp->loggedin_user->id )
+        if ( $user_id != bp_loggedin_user_id() )
             $hidden_sql = " AND g.status != 'hidden'";
 
@@ -939 +939 @@
             $user_id = bp_displayed_user_id();
 
-        if ( $user_id != $bp->loggedin_user->id && !is_super_admin() ) {
+        if ( $user_id != bp_loggedin_user_id() && !is_super_admin() ) {
             return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id ) );
         } else {
@@ -1126 +1126 @@
 
         if ( bp_is_active( 'friends' ) ) {
-            $friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids} ) ) OR (initiator_user_id IN ( {$user_ids} ) AND friend_user_id = %d )", $bp->loggedin_user->id, $bp->loggedin_user->id ) );
+            $friend_status = $wpdb->get_results( $wpdb->prepare( "SELECT initiator_user_id, friend_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id IN ( {$user_ids} ) ) OR (initiator_user_id IN ( {$user_ids} ) AND friend_user_id = %d )", bp_loggedin_user_id(), bp_loggedin_user_id() ) );
             for ( $i = 0, $count = count( $members ); $i < $count; ++$i ) {
                 foreach ( (array)$friend_status as $status ) {