diff --git bp-groups/bp-groups-classes.php bp-groups/bp-groups-classes.php
index 2ed7441..bed0eb7 100644
--- bp-groups/bp-groups-classes.php
+++ bp-groups/bp-groups-classes.php
@@ -1460,6 +1460,7 @@ class BP_Group_Member_Query extends BP_User_Query {
'group_id' => 0,
'group_role' => array( 'member' ),
'is_confirmed' => true,
+ 'type' => 'last_modified',
) );
$group_member_ids = $this->get_group_member_ids();
@@ -1562,16 +1563,36 @@ class BP_Group_Member_Query extends BP_User_Query {
/** ORDER BY clause ***************************************************/
- // @todo For now, mimicking legacy behavior of
- // bp_group_has_members(), which has us order by date_modified
- // only. Should abstract it in the future
+ /**
+ * The order for alphabetical type will be set in
+ * BP_Group_Member_Query->set_orderby() In the group members
+ * table, date_modified is the 'sortable' field available.
+ * The two remaining types, last_modified and first_modified,
+ * are managed here.
+ */
+
+ if ( isset( $this->query_vars['type'] ) ) {
+ $type = $this->query_vars['type'];
+ } else {
+ $type = 'last_modified';
+ }
+
$sql['orderby'] = "ORDER BY date_modified";
$sql['order'] = "DESC";
+ if ( 'first_modified' == $type ) {
+ $sql['order'] = "ASC";
+ }
+
/** LIMIT clause ******************************************************/
$this->group_member_ids = $wpdb->get_col( "{$sql['select']} {$sql['where']} {$sql['orderby']} {$sql['order']} {$sql['limit']}" );
- return $this->group_member_ids;
+ /**
+ * You can filter the group member ids from here to build your custom query
+ * if you defined a custom type using the action 'bp_groups_members_order_options'
+ * for instance
+ */
+ return apply_filters( 'bp_group_member_query_group_member_ids', $this->group_member_ids, $type, $this->query_vars['group_id'] );
}
/**
@@ -1583,16 +1604,21 @@ class BP_Group_Member_Query extends BP_User_Query {
* @param BP_User_Query $query BP_User_Query object.
*/
public function set_orderby( $query ) {
- $gm_ids = $this->get_group_member_ids();
+
+ $gm_ids = $this->get_group_member_ids( $query->query_vars['type'] );
+
if ( empty( $gm_ids ) ) {
$gm_ids = array( 0 );
}
- // The first param in the FIELD() clause is the sort column id
- $gm_ids = array_merge( array( 'u.id' ), wp_parse_id_list( $gm_ids ) );
- $gm_ids_sql = implode( ',', $gm_ids );
+ // No need to change the order of BP_User_Query in case type is alphabetical
+ if ( 'alphabetical' != $query->query_vars['type'] ) {
+ // The first param in the FIELD() clause is the sort column id
+ $gm_ids = array_merge( array( 'u.id' ), wp_parse_id_list( $gm_ids ) );
+ $gm_ids_sql = implode( ',', $gm_ids );
- $query->uid_clauses['orderby'] = "ORDER BY FIELD(" . $gm_ids_sql . ")";
+ $query->uid_clauses['orderby'] = "ORDER BY FIELD(" . $gm_ids_sql . ")";
+ }
// Prevent this filter from running on future BP_User_Query
// instances on the same page
diff --git bp-groups/bp-groups-functions.php bp-groups/bp-groups-functions.php
index a27a499..9642849 100644
--- bp-groups/bp-groups-functions.php
+++ bp-groups/bp-groups-functions.php
@@ -422,6 +422,7 @@ function groups_get_group_members( $args = array() ) {
'exclude' => false,
'group_role' => array(),
'search_terms' => false,
+ 'type' => 'last_modified'
) );
// For legacy users. Use of BP_Groups_Member::get_all_for_group()
@@ -455,7 +456,7 @@ function groups_get_group_members( $args = array() ) {
'group_role' => $r['group_role'],
'exclude' => $r['exclude'],
'search_terms' => $r['search_terms'],
- 'type' => 'last_modified',
+ 'type' => $r['type'],
) );
// Structure the return value as expected by the template functions
diff --git bp-groups/bp-groups-template.php bp-groups/bp-groups-template.php
index 675409e..44fe89b 100644
--- bp-groups/bp-groups-template.php
+++ bp-groups/bp-groups-template.php
@@ -1982,6 +1982,7 @@ class BP_Groups_Group_Members_Template {
'exclude_banned' => 1,
'group_role' => false,
'search_terms' => false,
+ 'type' => 'last_modified',
) );
// @todo No
@@ -1990,6 +1991,17 @@ class BP_Groups_Group_Members_Template {
$this->pag_page = isset( $_REQUEST['mlpage'] ) ? intval( $_REQUEST['mlpage'] ) : $r['page'];
$this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
+ /**
+ * In themes, If 'groups/single/home' template has been updated
+ * but not 'groups/single/members', it prevents the pagination
+ * url to be messed up with admin-ajax.
+ */
+ $base_url = trailingslashit( bp_get_group_permalink( groups_get_current_group() ) . bp_current_action() );
+
+ if ( bp_action_variable() ) {
+ $base_url = trailingslashit( $base_url . bp_action_variable() );
+ }
+
$members_args = $r;
$members_args['page'] = $this->pag_page;
@@ -2014,7 +2026,7 @@ class BP_Groups_Group_Members_Template {
}
$this->pag_links = paginate_links( array(
- 'base' => add_query_arg( 'mlpage', '%#%' ),
+ 'base' => add_query_arg( array( 'mlpage' => '%#%' ), $base_url ),
'format' => '',
'total' => !empty( $this->pag_num ) ? ceil( $this->total_member_count / $this->pag_num ) : $this->total_member_count,
'current' => $this->pag_page,
@@ -2091,16 +2103,23 @@ class BP_Groups_Group_Members_Template {
function bp_group_has_members( $args = '' ) {
global $members_template;
+ $exclude_admins_mods = 1;
+
+ if ( bp_is_group_members() ) {
+ $exclude_admins_mods = 0;
+ }
+
$r = wp_parse_args( $args, array(
'group_id' => bp_get_current_group_id(),
'page' => 1,
'per_page' => 20,
'max' => false,
'exclude' => false,
- 'exclude_admins_mods' => 1,
+ 'exclude_admins_mods' => $exclude_admins_mods,
'exclude_banned' => 1,
'group_role' => false,
'search_terms' => false,
+ 'type' => 'last_modified',
) );
if ( empty( $r['search_terms'] ) && ! empty( $_REQUEST['s'] ) )
@@ -2282,6 +2301,57 @@ function bp_group_member_admin_pagination() {
return $members_template->pag_links;
}
+/**
+ * Output the Group members template
+ *
+ * @since BuddyPress (?)
+ *
+ * @return string html output
+ */
+function bp_groups_members_template_part() {
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-