Fallback to english if Language::getDefault() returns null (e.g. user sets the interface in a language, but translations are disabled)

This commit is contained in:
Flavio Copes
2015-08-29 14:39:37 +02:00
parent 984edcb71d
commit ea30fcc43f

View File

@@ -716,11 +716,13 @@ class Admin
$languages = ['en'];
}
foreach ((array)$languages as $lang) {
$translation = $this->grav['language']->getTranslation($lang, $lookup, $array_support);
if (!$translation) {
$translation = $this->grav['language']->getTranslation($this->grav['language']->getDefault(), $lookup, $array_support);
$language = $this->grav['language']->getDefault() ?: 'en';
$translation = $this->grav['language']->getTranslation($language, $lookup, $array_support);
}
if ($translation) {