From f2cd17d944560b8433479d2ddb2c390f99058fda Mon Sep 17 00:00:00 2001 From: Kartik Suthar Date: Fri, 17 Jan 2025 12:13:46 +0530 Subject: [PATCH] WIP - group member query --- src/bp-core/classes/class-bp-invitation.php | 2 +- src/bp-groups/classes/class-bp-group-member-query.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bp-core/classes/class-bp-invitation.php b/src/bp-core/classes/class-bp-invitation.php index 3992e1a6df..99f5c5b1f9 100644 --- a/src/bp-core/classes/class-bp-invitation.php +++ b/src/bp-core/classes/class-bp-invitation.php @@ -843,7 +843,7 @@ public static function get( $args = array() ) { $paged_invites_sql = apply_filters( 'bp_invitations_get_paged_invitations_sql', $paged_invites_sql, $sql, $r ); if ( ! empty( $r['retval'] ) && 'sql' == $r['retval'] ) { - return $paged_invites_sql; + return str_replace( $sql['orderby'] . ' ' . $sql['pagination'], '', $paged_invites_sql ); } $cached = bp_core_get_incremented_cache( $paged_invites_sql, 'bp_invitations' ); diff --git a/src/bp-groups/classes/class-bp-group-member-query.php b/src/bp-groups/classes/class-bp-group-member-query.php index f45f5d8533..cf7809406d 100644 --- a/src/bp-groups/classes/class-bp-group-member-query.php +++ b/src/bp-groups/classes/class-bp-group-member-query.php @@ -632,8 +632,9 @@ protected function get_group_member_ids_sql( $include = array() ) { } $sql['order'] = 'first_joined' === $this->query_vars['type'] ? 'ASC' : 'DESC'; - - $group_member_ids_sql = "{$sql['select']} {$sql['where']} {$sql['orderby']} {$sql['order']}"; + if ( $this->query_vars['type'] === 'group_role' ) { + $sql['order'] = $sql['order'] . ', user_id'; + } $invited_member_ids_sql = ''; @@ -691,12 +692,13 @@ protected function get_group_member_ids_sql( $include = array() ) { $invite_args['retval'] = 'sql'; $invited_member_ids_sql = groups_get_invites( $invite_args ); - } if ( ! empty( $invited_member_ids_sql ) ) { + $group_member_ids_sql = "{$sql['select']} {$sql['where']}"; $this->group_member_ids_sql = $group_member_ids_sql . ' UNION ' . $invited_member_ids_sql; } else { + $group_member_ids_sql = "{$sql['select']} {$sql['where']} {$sql['orderby']} {$sql['order']}"; $this->group_member_ids_sql = $group_member_ids_sql; }