MDL-12345 - use consistent ordering on both sides of the assign group members

pane, sorted by lastname like other screens
merged from MOODLE_19_STABLE

diff --git a/group/lib.php b/group/lib.php
index 84bee7ecc043eff9a78f2342338e55eb19b2dc12..0f9a495fdaeea91cb5b00c54749f354188ff6243 100644 (file)
--- 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 d1cac6d362fd78ba6f9dce1472e70e33e40b8a91..51981eb136746c5c0f08e478190d35d13d44fa7f 100644 (file)
--- 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) {