mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

[ticket/12254] Use new set_lang var to avoid conflict with change_lang

Browse Source 
PHPBB3-12254
This commit is contained in:
Matt Friedman
2014-04-07 09:14:58 -07:00
parent a5940ede5b
commit daae87d65a
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/user.php
View File

@@ -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
{