makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#11435

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7737 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-06-09 11:40:02 +00:00
parent 455536773f
commit 1928195750
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -253,6 +253,7 @@ p a {
<li>[Fix] Use icon-unsubscribe in prosilver (Bug #12211)</li> <li>[Fix] Use icon-unsubscribe in prosilver (Bug #12211)</li>
<li>[Fix] Seperated PREVIOUS/NEXT language vars for pagination and next/previous step (Bug #12197)</li> <li>[Fix] Seperated PREVIOUS/NEXT language vars for pagination and next/previous step (Bug #12197)</li>
<li>[Feature] append_sid() supporting anchor (Bug #11535) - patch provided by Schumi and ToonArmy</li> <li>[Feature] append_sid() supporting anchor (Bug #11535) - patch provided by Schumi and ToonArmy</li>
<li>[Fix] Remember selected language while registering after submit (Bug #11435)</li>
</ul> </ul>

21
phpBB/includes/ucp/ucp_register.php
View file

@ -34,26 +34,31 @@ class ucp_register
$agreed = (!empty($_POST['agreed'])) ? 1 : 0; $agreed = (!empty($_POST['agreed'])) ? 1 : 0;
$submit = (isset($_POST['submit'])) ? true : false; $submit = (isset($_POST['submit'])) ? true : false;
$change_lang = request_var('change_lang', ''); $change_lang = request_var('change_lang', '');
$user_lang = request_var('lang', $user->lang_name);
if ($change_lang) if ($change_lang || $user_lang != $config['default_lang'])
{ {
$change_lang = basename($change_lang); $use_lang = ($change_lang) ? basename($change_lang) : basename($user_lang);
if (file_exists($phpbb_root_path . 'language/' . $change_lang . '/')) if (file_exists($phpbb_root_path . 'language/' . $use_lang . '/'))
{ {
$submit = false; if ($change_lang)
{
$submit = false;
$user->lang_name = $lang = $change_lang; // Setting back agreed to let the user view the agreement in his/her language
$agreed = (empty($_GET['change_lang'])) ? 0 : $agreed;
}
$user->lang_name = $lang = $use_lang;
$user->lang_path = $phpbb_root_path . 'language/' . $lang . '/'; $user->lang_path = $phpbb_root_path . 'language/' . $lang . '/';
$user->lang = array(); $user->lang = array();
$user->add_lang(array('common', 'ucp')); $user->add_lang(array('common', 'ucp'));
// Setting back agreed to let the user view the agreement in his/her language
$agreed = (empty($_GET['change_lang'])) ? 0 : $agreed;
} }
else else
{ {
$change_lang = ''; $change_lang = '';
$user_lang = $user->lang_name;
} }
} }