Ticket #6431: 6431.diff

src/bp-groups/classes/class-bp-groups-group.php

@@ -909 +909 @@
 
                 // Populate some extra information instead of querying each time in the loop.
                 if ( !empty( $r['populate_extras'] ) ) {
-                        $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, $r['type'] );
+                        $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, $r['type'], $r['user_id'] );
                 }
 
                 // Grab all groupmeta.
@@ -1186 +1186 @@
                         foreach ( (array) $paged_groups as $group ) {
                                 $group_ids[] = $group->id;
                         }
-                        $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, 'newest' );
+                        $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, 'newest', $user_id );
                 }
 
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -1318 +1318 @@
                         foreach ( (array) $paged_groups as $group ) {
                                 $group_ids[] = $group->id;
                         }
-                        $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, 'newest' );
+                        $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, 'newest', $user_id );
                 }
 
                 return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -1340 +1340 @@
          * @param string|bool  $type         Not used.
          * @return array $paged_groups
          */
-        public static function get_group_extras( &$paged_groups, &$group_ids, $type = false ) {
+        public static function get_group_extras( &$paged_groups, &$group_ids, $type = false, $user_id = false ) {
                 global $wpdb;
 
-                if ( empty( $group_ids ) )
+                if ( empty( $group_ids ) ) {
                         return $paged_groups;
+                }
+
+                $user_id = empty( $user_id ) ? bp_loggedin_user_id() : $user_id;
 
                 $bp = buddypress();
 
                 // Sanitize group IDs.
                 $group_ids = implode( ',', wp_parse_id_list( $group_ids ) );
 
-                // Fetch the logged-in user's status within each group.
-                if ( is_user_logged_in() ) {
-                        $user_status_results = $wpdb->get_results( $wpdb->prepare( "SELECT group_id, is_confirmed, invite_sent FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_banned = 0", bp_loggedin_user_id() ) );
+                // Fetch the user's status within each group.
+                if ( ! empty( $user_id ) ) {
+                        $extras = $wpdb->get_results( $wpdb->prepare( "SELECT group_id, is_confirmed, invite_sent, is_banned FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} )", $user_id ) );
                 } else {
-                        $user_status_results = array();
+                        $extras = array();
                 }
 
                 // Reindex.
                 $user_status = array();
-                foreach ( $user_status_results as $user_status_result ) {
-                        $user_status[ $user_status_result->group_id ] = $user_status_result;
+                foreach ( $extras as $extra ) {
+                        $user_status[ $extra->group_id ] = $extra;
                 }
 
+                // Mock defaults values for extras
+                $is_member = $is_invited = $is_pending = '0';
+                $is_banned = false;
+
                 for ( $i = 0, $count = count( $paged_groups ); $i < $count; ++$i ) {
-                        $is_member = $is_invited = $is_pending = '0';
                         $gid = $paged_groups[ $i ]->id;
 
                         if ( isset( $user_status[ $gid ] ) ) {
-
-                                // The is_confirmed means the user is a member.
                                 if ( $user_status[ $gid ]->is_confirmed ) {
                                         $is_member = '1';
+                                }
 
-                                // The invite_sent means the user has been invited.
-                                } elseif ( $user_status[ $gid ]->invite_sent ) {
+                                if ( $user_status[ $gid ]->invite_sent ) {
                                         $is_invited = '1';
+                                }
 
-                                // User has sent request, but has not been confirmed.
-                                } else {
+                                // If isn't member and invited update pending flag.
+                                if ( '1' !== $is_member && '1' !== $is_invited ) {
                                         $is_pending = '1';
                                 }
+
+                                // If user is banned reset extras to default values.
+                                if ( $user_status[ $gid ]->is_banned ) {
+                                        $is_member = $is_invited = $is_pending = '0';
+                                        $is_banned = true;
+                                }
                         }
 
-                        $paged_groups[ $i ]->is_member = $is_member;
+                        $paged_groups[ $i ]->is_member  = $is_member;
                         $paged_groups[ $i ]->is_invited = $is_invited;
                         $paged_groups[ $i ]->is_pending = $is_pending;
-                }
-
-                if ( is_user_logged_in() ) {
-                        $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() ) );
-                } else {
-                        $user_banned = array();
-                }
-
-                for ( $i = 0, $count = count( $paged_groups ); $i < $count; ++$i ) {
-                        $paged_groups[$i]->is_banned = false;
-
-                        foreach ( (array) $user_banned as $group_id ) {
-                                if ( $group_id == $paged_groups[$i]->id ) {
-                                        $paged_groups[$i]->is_banned = true;
-                                }
-                        }
+                        $paged_groups[ $i ]->is_banned  = $is_banned;
                 }
 
                 return $paged_groups;