diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-07 16:19:23 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-07 16:19:23 +0100 |
| commit | fffbbbdcc49f99b141b610ac94f5e8486de25aa8 (patch) | |
| tree | 0f22ff6992ecc1cbd2972c468e549edddfd10c2d /phpBB/phpbb/install/controller/helper.php | |
| parent | f258aebc593cfceb90369741ed8ab03581d689c3 (diff) | |
| parent | 37705353c53a391aa44da7a30f10ed824a442cfc (diff) | |
| download | forums-fffbbbdcc49f99b141b610ac94f5e8486de25aa8.tar forums-fffbbbdcc49f99b141b610ac94f5e8486de25aa8.tar.gz forums-fffbbbdcc49f99b141b610ac94f5e8486de25aa8.tar.bz2 forums-fffbbbdcc49f99b141b610ac94f5e8486de25aa8.tar.xz forums-fffbbbdcc49f99b141b610ac94f5e8486de25aa8.zip | |
Merge pull request #4169 from CHItA/ticket/14460
[ticket/14460] Use the selected language with AJAX requests as well
* CHItA/ticket/14460:
[ticket/14460] Use the selected language with AJAX requests as well
Diffstat (limited to 'phpBB/phpbb/install/controller/helper.php')
| -rw-r--r-- | phpBB/phpbb/install/controller/helper.php | 7 |
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); |