Ticket #6431: class-bp-groups-group.php.patch

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

@@ -925 +925 @@
 
                 // 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
@@ -1352 +1352 @@
          *
          * Data fetched:
          *
-         *     - Logged-in user's status within each group (is_member,
-         *       is_confirmed, is_pending, is_banned)
+         *     - User's status within each group (is_member,
+         *       is_confirmed, is_pending, is_banned). If $user_id is false the logged in user is used
          *
          * @param array $paged_groups Array of groups.
          * @param string|array Array or comma-separated list of IDs matching
          *        $paged_groups.
          * @param string $type Not used.
+         * @param int $user_id The id for the user.
          * @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 ) )
@@ -1372 +1373 @@
                 // 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() ) );
+                if ( $user_id  ) {
+                        $user_id = esc_sql( $user_id );
+                } 
+                else {
+                        if ( is_user_logged_in() ) {
+                                $user_id = bp_loggedin_user_id();
+                        }
+                }
+                
+                // Fetch the user's status within each group
+                if ( ! empty( $user_id ) ) {
+                        $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", $user_id));
                 } else {
                         $user_status_results = array();
                 }
@@ -1410 +1420 @@
                         $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() ) );
+                if ( ! empty( $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} )", $user_id));
                 } else {
                         $user_banned = array();
                 }