From: stronk7 <stronk7>
Date: Fri, 10 Oct 2008 21:30:07 +0000 (+0000)
Subject: Detect non-utf8 langs in user edition forms.  MDL-16845 MDL-11829 ; merged from 19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=eb309bededb7efd00a2a3c7deff3bf44a8db606d;p=moodle.git

Detect non-utf8 langs in user edition forms.  MDL-16845 MDL-11829 ; merged from 19_STABLE
---

diff --git a/user/edit_form.php b/user/edit_form.php
index b18528d2e0..e35b173ccf 100644
--- a/user/edit_form.php
+++ b/user/edit_form.php
@@ -46,7 +46,14 @@ class user_edit_form extends moodleform {
         // if language does not exist, use site default lang
         if ($langsel = $mform->getElementValue('lang')) {
             $lang = reset($langsel);
-            if (!file_exists($CFG->dataroot.'/lang/'.$lang) and 
+            // missing _utf8 in language, add it before further processing. MDL-11829 MDL-16845
+            if (strpos($lang, '_utf8') === false) {
+                $lang = $lang . '_utf8';
+                $lang_el =& $mform->getElement('lang');
+                $lang_el->setValue($lang);
+            }
+            // check lang exists
+            if (!file_exists($CFG->dataroot.'/lang/'.$lang) and
               !file_exists($CFG->dirroot .'/lang/'.$lang)) {
                 $lang_el =& $mform->getElement('lang');
                 $lang_el->setValue($CFG->lang);
diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
index 2d16192f53..9ba149862e 100644
--- a/user/editadvanced_form.php
+++ b/user/editadvanced_form.php
@@ -61,7 +61,14 @@ class user_editadvanced_form extends moodleform {
         // if language does not exist, use site default lang
         if ($langsel = $mform->getElementValue('lang')) {
             $lang = reset($langsel);
-            if (!file_exists($CFG->dataroot.'/lang/'.$lang) and 
+            // missing _utf8 in language, add it before further processing. MDL-11829 MDL-16845
+            if (strpos($lang, '_utf8') === false) {
+                $lang = $lang . '_utf8';
+                $lang_el =& $mform->getElement('lang');
+                $lang_el->setValue($lang);
+            }
+            // check lang exists
+            if (!file_exists($CFG->dataroot.'/lang/'.$lang) and
               !file_exists($CFG->dirroot .'/lang/'.$lang)) {
                 $lang_el =& $mform->getElement('lang');
                 $lang_el->setValue($CFG->lang);