diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-03 00:15:28 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-03 00:15:28 +0200 |
| commit | 1399d60954b484ac5ee0c9aca09b9a6221c04de0 (patch) | |
| tree | a4cf519cf6c6de5b39e576c54916949274df043b /phpBB/phpbb/user.php | |
| parent | 936518d201c5523ee71c5ee46f4415aa4bb9f4cf (diff) | |
| parent | 257ff46659cb2f35514b21a5345dd68b666e6994 (diff) | |
| download | forums-1399d60954b484ac5ee0c9aca09b9a6221c04de0.tar forums-1399d60954b484ac5ee0c9aca09b9a6221c04de0.tar.gz forums-1399d60954b484ac5ee0c9aca09b9a6221c04de0.tar.bz2 forums-1399d60954b484ac5ee0c9aca09b9a6221c04de0.tar.xz forums-1399d60954b484ac5ee0c9aca09b9a6221c04de0.zip | |
Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeus
* github-vse/ticket/10521:
[ticket/10521] Allow language switching by URL parameter
Diffstat (limited to 'phpBB/phpbb/user.php')
| -rw-r--r-- | phpBB/phpbb/user.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 2f186593ec..f8e473dcad 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -80,10 +80,18 @@ class user extends \phpbb\session } else { - $change_lang = $request->variable($config['cookie_name'] . '_lang', '', true, \phpbb\request\request_interface::COOKIE); - if ($change_lang) + $lang_override = $request->variable('language', ''); + if ($lang_override) { - $use_lang = basename($change_lang); + $this->set_cookie('lang', $lang_override, 0, false); + } + else + { + $lang_override = $request->variable($config['cookie_name'] . '_lang', '', true, \phpbb\request\request_interface::COOKIE); + } + if ($lang_override) + { + $use_lang = basename($lang_override); $user_lang_name = (file_exists($this->lang_path . $use_lang . "/common.$phpEx")) ? $use_lang : basename($config['default_lang']); $this->data['user_lang'] = $user_lang_name; } |