From 2c3d97cc8fadf6b0d68076bea123963b7d40d2e5 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 1 Dec 2017 16:14:51 +0100 Subject: [PATCH] check if $defaultLanguage is a valid string before we move on Signed-off-by: Bjoern Schiessle --- lib/private/L10N/Factory.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index 150b36cec4..e277a00e65 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -290,8 +290,9 @@ class Factory implements IFactory { // use formal version of german ("Sie" instead of "Du") if the default // language is set to 'de_DE' if possible - if (strtolower($lang) === 'de' - && strtolower($defaultLanguage) === 'de_de' && + if (is_string($defaultLanguage) && + strtolower($lang) === 'de' && + strtolower($defaultLanguage) === 'de_de' && $this->languageExists($app, 'de_DE') ) { $result = 'de_DE';