diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-03 22:51:13 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-03 22:51:13 +0200 |
| commit | b2b3e1ac946d340b1c5b9ff1af97def6365c4967 (patch) | |
| tree | db51131a9159ca17c6dc0e6ca569c6f6eb00b497 | |
| parent | 3d2116dfe750bceecdde464985046b3116e3e470 (diff) | |
| parent | 712e478cb2b430354ef173a48158472d0a004dd3 (diff) | |
| download | nextcloud-server-b2b3e1ac946d340b1c5b9ff1af97def6365c4967.tar.gz nextcloud-server-b2b3e1ac946d340b1c5b9ff1af97def6365c4967.zip | |
Merge pull request #15391 from owncloud/fix-language-caching
fix caching of preferred language
| -rw-r--r-- | lib/private/l10n.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/l10n.php b/lib/private/l10n.php index 95b80bebdb2..59f26423afa 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -125,7 +125,7 @@ class OC_L10N implements \OCP\IL10N { $preferred_language = str_replace('-', '_', $preferred_language); foreach ($available as $available_language) { if ($preferred_language === strtolower($available_language)) { - if (is_null($app)) { + if (!is_array($app)) { self::$language = $available_language; } return $available_language; @@ -133,7 +133,7 @@ class OC_L10N implements \OCP\IL10N { } foreach ($available as $available_language) { if (substr($preferred_language, 0, 2) === $available_language) { - if (is_null($app)) { + if (!is_array($app)) { self::$language = $available_language; } return $available_language; @@ -142,6 +142,7 @@ class OC_L10N implements \OCP\IL10N { } } + self::$language = 'en'; // Last try: English return 'en'; } |