Commit 564fa161 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Revert to default language less angrily when a user's preferred lang gets uninstalled

parent 630743bc
...@@ -395,6 +395,10 @@ function get_languages() { ...@@ -395,6 +395,10 @@ function get_languages() {
return $langs; return $langs;
} }
function language_installed($lang) {
return is_readable(get_config('docroot') . 'lang/' . $lang . '/langconfig.php');
}
/** /**
* Return a list of available themes * Return a list of available themes
* Need to add the theme names sometime; for now use get_string(). * Need to add the theme names sometime; for now use get_string().
...@@ -694,7 +698,10 @@ function current_language() { ...@@ -694,7 +698,10 @@ function current_language() {
if ($USER instanceof User) { if ($USER instanceof User) {
$lang = $USER->get_account_preference('lang'); $lang = $USER->get_account_preference('lang');
if ($lang !== null && $lang != 'default') { if ($lang !== null && $lang != 'default') {
return $lang; if (language_installed($lang)) {
return $lang;
}
$USER->set_account_preference('lang', 'default');
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment