1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
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

View File

@@ -34,26 +34,31 @@ class ucp_register
$agreed = (!empty($_POST['agreed'])) ? 1 : 0;
$submit = (isset($_POST['submit'])) ? true : false;
$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 = array();
$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
{
$change_lang = '';
$user_lang = $user->lang_name;
}
}