diff options
| author | Matt Friedman <maf675@gmail.com> | 2014-04-07 09:14:58 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2014-04-07 09:14:58 -0700 |
| commit | daae87d65a20664af09a002f90483cc75e84d01f (patch) | |
| tree | e5b65105f6f7fe69910885fde2a84a7bb0b2ebc7 /phpBB/phpbb/user.php | |
| parent | a5940ede5bc8a7594b84fd4b489ada2110ecbdcc (diff) | |
| download | forums-daae87d65a20664af09a002f90483cc75e84d01f.tar forums-daae87d65a20664af09a002f90483cc75e84d01f.tar.gz forums-daae87d65a20664af09a002f90483cc75e84d01f.tar.bz2 forums-daae87d65a20664af09a002f90483cc75e84d01f.tar.xz forums-daae87d65a20664af09a002f90483cc75e84d01f.zip | |
[ticket/12254] Use new set_lang var to avoid conflict with change_lang
PHPBB3-12254
Diffstat (limited to 'phpBB/phpbb/user.php')
| -rw-r--r-- | phpBB/phpbb/user.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index d9ff75b997..36f72a69b9 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -80,7 +80,7 @@ class user extends \phpbb\session } else { - $change_lang = $request->variable('change_lang', ''); + $change_lang = $request->variable('set_lang', ''); if ($change_lang) { global $SID, $_EXTRA_URL; @@ -88,8 +88,8 @@ class user extends \phpbb\session $use_lang = basename($change_lang); $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; - $SID .= '&change_lang=' . $user_lang_name; - $_EXTRA_URL[] = 'change_lang=' . $user_lang_name; + $SID .= '&set_lang=' . $user_lang_name; + $_EXTRA_URL[] = 'set_lang=' . $user_lang_name; } else { |