Changeset 7616 for trunk/bp-groups/bp-groups-classes.php

Timestamp:

11/29/2013 07:37:58 PM (13 years ago)

Author:

boonebgorges

Message:

Refactor get_group_extras logic in group loops

The previous logic made it so that is_pending, is_invited, and is_member
values were only set in the case where users had a membership for the group
in the database. This could result in PHP warnings in certain cases, and in
all cases results in inconsistent data structures between member and non-member
groups within group loops.

Fixes #5269

File:

• trunk/bp-groups/bp-groups-classes.php (modified) (1 diff)

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

@@ -855 +855 @@
 
                 // Fetch the logged-in user's status within each group
-                $user_status = $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() ) );
+                $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() ) );
+
+                // Reindex
+                $user_status = array();
+                foreach ( $user_status_results as $user_status_result ) {
+                        $user_status[ $user_status_result->group_id ] = $user_status_result;
+                }
 
                 for ( $i = 0, $count = count( $paged_groups ); $i < $count; ++$i ) {
-                        foreach ( (array) $user_status as $group ) {
-                                if ( $group->group_id == $paged_groups[ $i ]->id ) {
-                                        $is_member = $is_invited = $is_pending = '0';
-
-                                        // is_confirmed means the user is a member
-                                        if ( $group->is_confirmed ) {
-                                                $is_member = '1';
-
-                                        // invite_sent means the user has been invited
-                                        } else if ( $group->invite_sent ) {
-                                                $is_invited = '1';
-
-                                        // User has sent request, but has not been confirmed
-                                        } else {
-                                                $is_pending = '1';
-                                        }
-
-                                        $paged_groups[ $i ]->is_member = $is_member;
-                                        $paged_groups[ $i ]->is_invited = $is_invited;
-                                        $paged_groups[ $i ]->is_pending = $is_pending;
+                        $is_member = $is_invited = $is_pending = '0';
+                        $gid = $paged_groups[ $i ]->id;
+
+                        if ( isset( $user_status[ $gid ] ) ) {
+
+                                // is_confirmed means the user is a member
+                                if ( $user_status[ $gid ]->is_confirmed ) {
+                                        $is_member = '1';
+
+                                // invite_sent means the user has been invited
+                                } else if ( $user_status[ $gid ]->invite_sent ) {
+                                        $is_invited = '1';
+
+                                // User has sent request, but has not been confirmed
+                                } else {
+                                        $is_pending = '1';
                                 }
                         }
+
+                        $paged_groups[ $i ]->is_member = $is_member;
+                        $paged_groups[ $i ]->is_invited = $is_invited;
+                        $paged_groups[ $i ]->is_pending = $is_pending;
                 }