merge from 19_STABLE

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 5da35c6adaaa7ba08c5ad32aded164e288ed6b44..6b6b8ec038fa299260e3653e7ea450cd5ecc5e96 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -5473,7 +5473,7 @@ function get_list_of_countries() {
     }
 
     if (!empty($string)) {
-        asort($string);
+        uasort($string, 'strcoll');
     }
 
     return $string;