From ea30fcc43f0aa08b3baec88e12c6bdf3dc1127c6 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Sat, 29 Aug 2015 14:39:37 +0200 Subject: [PATCH] Fallback to english if Language::getDefault() returns null (e.g. user sets the interface in a language, but translations are disabled) --- classes/admin.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/admin.php b/classes/admin.php index be3cad89..4f7f41d5 100644 --- a/classes/admin.php +++ b/classes/admin.php @@ -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) {