L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
stronk7
2008-10-10 21:30:07 +00:00
parent 781c4319e3
commit eb309beded
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/edit_form.php
+8 -1
View File
@@ -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);
user/editadvanced_form.php
+8 -1
View File
@@ -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);