Changeset 12435

Timestamp:

08/12/2019 08:44:30 PM (6 years ago)

Author:

dcavins

Message:

Update BP_Nouveau_Group_Invite_Query for Invitations API compatibility.

See #6210.

File:

• trunk/src/bp-templates/bp-nouveau/includes/groups/classes.php (modified) (5 diffs)

trunk/src/bp-templates/bp-nouveau/includes/groups/classes.php

@@ -51 +51 @@
         $group_member_ids = $this->get_group_member_ids();
 
-        // We want to get users that are already members of the group
+        /**
+         * We want to exclude users who are already members or who have been
+         * invited by **any** of the group members to join it.
+         */
         $type = 'exclude';
 
-        // We want to get invited users who did not confirmed yet
+        // We want to get the invited users who did not confirmed yet.
         if ( false === $this->query_vars['is_confirmed'] ) {
             $type = 'include';
@@ -78 +81 @@
         }
 
+        // Fetch **all** invited users.
+        $pending_invites = groups_get_invites( array(
+            'item_id'     => $this->query_vars['group_id'],
+            'invite_sent' => 'sent',
+            'fields'      => 'user_ids'
+        ) );
+
+        // This is a clue that we only want the invitations.
+        if ( false === $this->query_vars['is_confirmed'] ) {
+            return $pending_invites;
+        }
+
+        /**
+         * Otherwise, we want group members _and_ users with outstanding invitations,
+         * because we're doing an "exclude" query.
+         */
         $bp  = buddypress();
         $sql = array(
@@ -92 +111 @@
         $sql['where'][] = $wpdb->prepare( 'group_id = %d', $this->query_vars['group_id'] );
 
-        if ( false === $this->query_vars['is_confirmed'] ) {
-            $sql['where'][] = $wpdb->prepare( 'is_confirmed = %d', (int) $this->query_vars['is_confirmed'] );
-            $sql['where'][] = 'inviter_id != 0';
-        }
-
         // Join the query part
         $sql['where'] = ! empty( $sql['where'] ) ? 'WHERE ' . implode( ' AND ', $sql['where'] ) : '';
@@ -107 +121 @@
         $this->group_member_ids = $wpdb->get_col( "{$sql['select']} {$sql['where']} {$sql['orderby']} {$sql['order']} {$sql['limit']}" );
 
-        return $this->group_member_ids;
+        return array_merge( $this->group_member_ids, $pending_invites );
     }
 
@@ -138 +152 @@
         }
 
-        $bp = buddypress();
-
-        return $wpdb->get_col( $wpdb->prepare( "SELECT inviter_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id ) );
+        return groups_get_invites( array(
+            'user_id'     => $user_id,
+            'item_id'     => $group_id,
+            'invite_sent' => 'sent',
+            'fields'      => 'inviter_ids'
+        ) );
     }
 }