Changeset 12486 for branches/5.0/src/bp-groups/bp-groups-functions.php

Timestamp:

10/30/2019 06:52:45 PM (7 years ago)

Author:

dcavins

Message:

Fix incorrect parameter key in groups_get_invites() call.

BP_Invitation::get() accepts an id parameter, but I was passing a misnamed ids parameter to the function in the cache-building routine within bp_get_user_groups(), resulting in all invitations being returned.

This changeset corrects the misnamed key and also skips the fetch-and-cache routine if no uncached items are found.

Props boonebgorges.

Fixes #8149.

File:

• branches/5.0/src/bp-groups/bp-groups-functions.php (modified) (1 diff)

branches/5.0/src/bp-groups/bp-groups-functions.php

@@ -981 +981 @@
                 // Prime the invitations cache.
                 $uncached_invitation_ids = bp_get_non_cached_ids( $invitation_ids, 'bp_groups_invitations_as_memberships' );
-
-                $uncached_invitations = groups_get_invites( array(
-                        'ids'         => $uncached_invitation_ids,
-                        'invite_sent' => 'all',
-                        'type'        => 'all'
-                ) );
-                foreach ( $uncached_invitations as $uncached_invitation ) {
-                        // Reshape the result as a membership db entry.
-                        $invitation = new StdClass;
-                        $invitation->id            = $uncached_invitation->id;
-                        $invitation->group_id      = $uncached_invitation->item_id;
-                        $invitation->user_id       = $uncached_invitation->user_id;
-                        $invitation->inviter_id    = $uncached_invitation->inviter_id;
-                        $invitation->is_admin      = false;
-                        $invitation->is_mod            = false;
-                        $invitation->user_title    = '';
-                        $invitation->date_modified = $uncached_invitation->date_modified;
-                        $invitation->comments      = $uncached_invitation->content;
-                        $invitation->is_confirmed  = false;
-                        $invitation->is_banned     = false;
-                        $invitation->invite_sent   = $uncached_invitation->invite_sent;
-                        wp_cache_set( $uncached_invitation->id, $invitation, 'bp_groups_invitations_as_memberships' );
+                if ( $uncached_invitation_ids ) {
+                        $uncached_invitations = groups_get_invites( array(
+                                'id'          => $uncached_invitation_ids,
+                                'invite_sent' => 'all',
+                                'type'        => 'all'
+                        ) );
+                        foreach ( $uncached_invitations as $uncached_invitation ) {
+                                // Reshape the result as a membership db entry.
+                                $invitation = new StdClass;
+                                $invitation->id            = $uncached_invitation->id;
+                                $invitation->group_id      = $uncached_invitation->item_id;
+                                $invitation->user_id       = $uncached_invitation->user_id;
+                                $invitation->inviter_id    = $uncached_invitation->inviter_id;
+                                $invitation->is_admin      = false;
+                                $invitation->is_mod        = false;
+                                $invitation->user_title    = '';
+                                $invitation->date_modified = $uncached_invitation->date_modified;
+                                $invitation->comments      = $uncached_invitation->content;
+                                $invitation->is_confirmed  = false;
+                                $invitation->is_banned     = false;
+                                $invitation->invite_sent   = $uncached_invitation->invite_sent;
+                                wp_cache_set( $uncached_invitation->id, $invitation, 'bp_groups_invitations_as_memberships' );
+                        }
                 }
-
-        }
-
+        }
 
         // Assemble filter array for use in `wp_list_filter()`.