aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install/controller/helper.php
diff options
context:
space:
mode:
authorMate Bartus <mate.bartus@gmail.com>2016-02-06 14:10:48 +0100
committerMate Bartus <mate.bartus@gmail.com>2016-02-06 14:14:26 +0100
commit37705353c53a391aa44da7a30f10ed824a442cfc (patch)
tree904866ad646eb70f9c347e9c13b0626a29a4e505 /phpBB/phpbb/install/controller/helper.php
parentdf505d772d2130427c36084f70aff7da8ca7342c (diff)
downloadforums-37705353c53a391aa44da7a30f10ed824a442cfc.tar
forums-37705353c53a391aa44da7a30f10ed824a442cfc.tar.gz
forums-37705353c53a391aa44da7a30f10ed824a442cfc.tar.bz2
forums-37705353c53a391aa44da7a30f10ed824a442cfc.tar.xz
forums-37705353c53a391aa44da7a30f10ed824a442cfc.zip
[ticket/14460] Use the selected language with AJAX requests as well
PHPBB3-14460
Diffstat (limited to 'phpBB/phpbb/install/controller/helper.php')
-rw-r--r--phpBB/phpbb/install/controller/helper.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
index 6859414236..ff7e691224 100644
--- a/phpBB/phpbb/install/controller/helper.php
+++ b/phpBB/phpbb/install/controller/helper.php
@@ -183,11 +183,6 @@ class helper
if (!empty($submit))
{
$lang = $this->phpbb_request->variable('language', '');
-
- if (!empty($lang))
- {
- $this->language_cookie = $lang;
- }
}
// Retrieve language from cookie
@@ -195,10 +190,10 @@ class helper
if (empty($lang) && !empty($lang_cookie))
{
$lang = $lang_cookie;
- $this->language_cookie = $lang;
}
$lang = (!empty($lang) && strpos($lang, '/') === false) ? $lang : null;
+ $this->language_cookie = $lang;
$this->render_language_select($lang);