diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-05-04 13:47:08 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2016-05-04 13:47:08 +0200 |
commit | 873849e8436b9a502038742ed7c1744e7954082b (patch) | |
tree | 2da1de188f60bfb84eed742498ce91bcd4b71099 /lib/private | |
parent | 61be98f554d83de3fbd76ce0772c48cb95ec1327 (diff) | |
parent | 9fbb8ce302bdc06621c7f22d09b3a672758b34cd (diff) | |
download | nextcloud-server-873849e8436b9a502038742ed7c1744e7954082b.tar.gz nextcloud-server-873849e8436b9a502038742ed7c1744e7954082b.zip |
Merge pull request #24432 from owncloud/issue-24270-never-save-app-language-into-request-lang
Do not save the language as request lang for apps when we didn't find…
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/L10N/Factory.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php index 8f157d9c0bb..08b92657a1b 100644 --- a/lib/private/L10N/Factory.php +++ b/lib/private/L10N/Factory.php @@ -263,7 +263,7 @@ class Factory implements IFactory { } } - if (!$this->requestLanguage) { + if ($app === null && !$this->requestLanguage) { $this->requestLanguage = 'en'; } return 'en'; // Last try: English |