MDL-9560 $CFG->langlist should accept both short (en) and long (en_utf8) names; merge...

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 36a167402b045237c13466f5da377fbbe3f48980..543d66f062e8a046a4a8688736eb3110951a77f0 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4560,6 +4560,13 @@ function get_list_of_languages() {
     if (!empty($CFG->langlist)) {       // use admin's list of languages
 
         $langlist = explode(',', $CFG->langlist);
+        // fix short lang names first - non existing langs are skipped anyway...
+        foreach ($langlist as $lang) {
+            if (strpos($lang, '_utf8') === false) {
+                $langlist[] = $lang.'_utf8';
+            }
+        }
+        // find existing langs from langlist
         foreach ($langlist as $lang) {
             $lang = trim($lang);   //Just trim spaces to be a bit more permissive
             if (strstr($lang, '_local')!==false) {