diff --git a/group/lib.php b/group/lib.php index 84bee7ecc04..0f9a495fdae 100644 --- a/group/lib.php +++ b/group/lib.php @@ -308,7 +308,7 @@ function groups_delete_groupings($courseid, $showfeedback=false) { * This function was changed to get_users_by_capability style * mostly because of the searchtext requirement */ -function groups_get_users_not_in_group($courseid, $groupid, $searchtext='') { +function groups_get_users_not_in_group($courseid, $groupid, $searchtext='', $sort = 'u.lastname ASC') { global $CFG; @@ -369,8 +369,9 @@ function groups_get_users_not_in_group($courseid, $groupid, $searchtext='') { WHERE groupid = $groupid) $wheresearch"; $groupby = " GROUP BY u.id, u.firstname, u.lastname "; + $orderby = " ORDER BY $sort"; - return get_records_sql($select.$from.$where.$groupby); + return get_records_sql($select.$from.$where.$groupby.$orderby); } @@ -490,4 +491,4 @@ function groups_unassign_grouping($groupingid, $groupid) { return delete_records('groupings_groups', 'groupingid', $groupingid, 'groupid', $groupid); } -?> \ No newline at end of file +?> diff --git a/group/members.php b/group/members.php index d1cac6d362f..51981eb1367 100644 --- a/group/members.php +++ b/group/members.php @@ -116,7 +116,6 @@ if ($potentialmemberscount <= MAX_USERS_PER_PAGE) { foreach ($potentialmembers as $userid => $user) { $nonmembers[$userid] = fullname($user)." (".@count($usergroups[$userid]).")"; } - natcasesort($nonmembers); // Print out the HTML foreach($nonmembers as $id => $name) {