Merge branch 'w06_MDL-26256_20_collator' of git://github.com/skodak/m…

…oodle
moodle · Feb 7, 2011 · e32d5f9 · e32d5f9
2 parents 476b123 + 0b661c7
commit e32d5f9
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/textlib.class.php b/lib/textlib.class.php
@@ -474,10 +474,11 @@ function strtotitle($text) {
      */
     function asort(array &$arr) {
         if (function_exists('collator_asort')) {
-            $coll = collator_create(get_string('locale', 'langconfig'));
-            collator_asort($coll, $arr);
-        } else {
-            asort($arr, SORT_LOCALE_STRING);
+            if ($coll = collator_create(get_string('locale', 'langconfig'))) {
+                collator_asort($coll, $arr);
+                return;
+            }
         }
+        asort($arr, SORT_LOCALE_STRING);
     }
 }