Correctly set the default language when not set in the user yaml (fixes language not changing problem)

This commit is contained in:
Flavio Copes
2015-08-19 10:17:50 +02:00
parent ecef4a19f2
commit 79bafcd6ab

View File

@@ -684,14 +684,12 @@ class Admin
} }
if ($lookup) { if ($lookup) {
if (empty($languages)) { if (empty($languages) || reset($languages) == null) {
if ($this->grav['config']->get('system.languages.translations_fallback', true)) { if ($this->grav['config']->get('system.languages.translations_fallback', true)) {
$languages = $this->grav['language']->getFallbackLanguages(); $languages = $this->grav['language']->getFallbackLanguages();
} else { } else {
$languages = (array)$this->grav['language']->getDefault(); $languages = (array)$this->grav['language']->getDefault();
} }
} else {
$languages = ['en'];
} }
} else { } else {
$languages = ['en']; $languages = ['en'];