MDL-6236 user editing - Default language not used instead of nonexisting one in user...

diff --git a/user/edit_form.php b/user/edit_form.php
index e0941dc1be0efac059a10232500a9f195fb18c52..3b0794b4d9c6267d1c70c37a528216f89c37e77e 100644 (file)
--- a/user/edit_form.php
+++ b/user/edit_form.php
@@ -42,6 +42,16 @@ class user_edit_form extends moodleform {
         $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
index f06b92296227c44a4042a518a210876ade335282..31140933fddcba15b45254d06b2e3102f1de1eb0 100644 (file)
--- a/user/editadvanced_form.php
+++ b/user/editadvanced_form.php
@@ -55,6 +55,16 @@ class user_editadvanced_form extends moodleform {
         $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');