mirror of
https://github.com/moodle/moodle.git
synced 2025-04-24 18:04:43 +02:00
Detect non-utf8 langs in user edition forms. MDL-16845 MDL-11829 ; merged from 19_STABLE
This commit is contained in:
parent
781c4319e3
commit
eb309beded
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user