MDL-6236 user editing - Default language not used instead of nonexist…

…ing one in user lang field - first lang chosen instead; merged from MODOLE_18_STABLE
moodle · Apr 16, 2007 · 1545d7f · 1545d7f
1 parent 5946594
commit 1545d7f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/user/edit_form.php b/user/edit_form.php
@@ -42,6 +42,16 @@ function definition_after_data() {
         $mform =& $this->_form;
         $userid = $mform->getElementValue('id');
 
+        // 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 
+              !file_exists($CFG->dirroot .'/lang/'.$lang)) {
+                $lang_el =& $mform->getElement('lang');
+                $lang_el->setValue($CFG->lang);
+            }
+        }
+
         if ($user = get_record('user', 'id', $userid)) {
 
             // print picture

diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
@@ -55,6 +55,16 @@ function definition_after_data() {
         $userid = $mform->getElementValue('id');
         $user = get_record('user', 'id', $userid);
 
+        // 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 
+              !file_exists($CFG->dirroot .'/lang/'.$lang)) {
+                $lang_el =& $mform->getElement('lang');
+                $lang_el->setValue($CFG->lang);
+            }
+        }
+
         // user can not change own auth method
         if ($userid == $USER->id) {
             $mform->hardFreeze('auth');