WIP - group member query

buddyboss · Jan 17, 2025 · f2cd17d · f2cd17d
1 parent e043243
commit f2cd17d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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;
 		}