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

Timestamp:

03/06/2014 07:58:49 PM (11 years ago)

Author:

boonebgorges

Message:

Replace internals of BP_Group_Membership_Requests_Template with BP_Group_Member_Query

This brings us more in line with the Invites template functions, and is another
step toward centralizing all of our group queries.

The change also allows for true pagination. This changeset also adds the 'page'
parameter to the stack.

See #5440

Props dcavins

File:

• trunk/bp-groups/bp-groups-classes.php (modified) (3 diffs)

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

@@ -1455 +1455 @@
  * - *Pending and unsent invitations* are entries with is_confirmed = 0 and
  *   inviter_id != 0 and invite_sent = 0
+ * - *Membership requests* are entries with is_confirmed = 0 and
+ *   inviter_id = 0 (and invite_sent = 0)
  *
  * @since BuddyPress (1.8.0)
@@ -1723 +1725 @@
 
         $bp     = buddypress();
-        $extras = $wpdb->get_results( $wpdb->prepare( "SELECT user_id, date_modified, is_banned FROM {$bp->groups->table_name_members} WHERE user_id IN ({$user_ids_sql}) AND group_id = %d", $this->query_vars['group_id'] ) );
+        $extras = $wpdb->get_results( $wpdb->prepare( "SELECT id, user_id, date_modified, is_admin, is_mod, comments, user_title, invite_sent, is_confirmed, inviter_id, is_banned FROM {$bp->groups->table_name_members} WHERE user_id IN ({$user_ids_sql}) AND group_id = %d", $this->query_vars['group_id'] ) );
 
         foreach ( (array) $extras as $extra ) {
@@ -1729 +1731 @@
                 // user_id is provided for backward compatibility
                 $this->results[ $extra->user_id ]->user_id       = (int) $extra->user_id;
+                $this->results[ $extra->user_id ]->is_admin      = (int) $extra->is_admin;
+                $this->results[ $extra->user_id ]->is_mod        = (int) $extra->is_mod;
                 $this->results[ $extra->user_id ]->is_banned     = (int) $extra->is_banned;
                 $this->results[ $extra->user_id ]->date_modified = $extra->date_modified;
+                $this->results[ $extra->user_id ]->user_title    = $extra->user_title;
+                $this->results[ $extra->user_id ]->comments      = $extra->comments;
+                $this->results[ $extra->user_id ]->invite_sent   = (int) $extra->invite_sent;
+                $this->results[ $extra->user_id ]->inviter_id    = (int) $extra->inviter_id;
+                $this->results[ $extra->user_id ]->is_confirmed  = (int) $extra->is_confirmed;
+                $this->results[ $extra->user_id ]->membership_id = (int) $extra->id;
             }
         }