mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
MDL-9559 setup_lang_from_browser should respect $CFG->langlist; merged from MOODLE_18_STABLE
This commit is contained in:
parent
f130a9d810
commit
14fba1729f
1 changed files with 6 additions and 1 deletions
|
@ -6914,9 +6914,14 @@ function setup_lang_from_browser() {
|
||||||
}
|
}
|
||||||
krsort($langs, SORT_NUMERIC);
|
krsort($langs, SORT_NUMERIC);
|
||||||
|
|
||||||
|
$langlist = get_list_of_languages();
|
||||||
|
|
||||||
/// Look for such langs under standard locations
|
/// Look for such langs under standard locations
|
||||||
foreach ($langs as $lang) {
|
foreach ($langs as $lang) {
|
||||||
$lang = clean_param($lang.'_utf8', PARAM_SAFEDIR); // clean it properly for include
|
$lang = strtolower(clean_param($lang.'_utf8', PARAM_SAFEDIR)); // clean it properly for include
|
||||||
|
if (!array_key_exists($lang, $langlist)) {
|
||||||
|
continue; // language not allowed, try next one
|
||||||
|
}
|
||||||
if (file_exists($CFG->dataroot .'/lang/'. $lang) or file_exists($CFG->dirroot .'/lang/'. $lang)) {
|
if (file_exists($CFG->dataroot .'/lang/'. $lang) or file_exists($CFG->dirroot .'/lang/'. $lang)) {
|
||||||
$SESSION->lang = $lang; /// Lang exists, set it in session
|
$SESSION->lang = $lang; /// Lang exists, set it in session
|
||||||
break; /// We have finished. Go out
|
break; /// We have finished. Go out
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue