From ca17e97ef8b1efb4ab76228ec351c8a721018154 Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Fri, 15 Jul 2011 06:26:53 +0000
Subject: [PATCH] r113

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@113 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/includes/ucp/usercp_register.php      | 6 ++++--
 upload/templates/default/usercp_register.tpl | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php
index 590ccde50..f61fcd7f7 100644
--- a/upload/includes/ucp/usercp_register.php
+++ b/upload/includes/ucp/usercp_register.php
@@ -85,6 +85,8 @@ switch ($mode)
 			'username'         => '',
 			'user_password'    => '',
 			'user_email'       => '',
+			'user_timezone'    => $bb_cfg['board_timezone'],
+			'user_lang'        => $bb_cfg['default_lang'],
 			'user_opt'         => 0,
 		);
 		break;
@@ -309,7 +311,7 @@ foreach ($profile_fields as $field => $can_edit)
 	*/
 	case 'user_lang':
 		$user_lang = isset($_POST['user_lang']) ? (string) $_POST['user_lang'] : $pr_data['user_lang'];
-		if ($submit && $user_lang != $pr_data['user_lang'])
+		if ($submit && ($user_lang != $pr_data['user_lang'] || $mode == 'register'))
 		{
             $pr_data['user_lang'] = $user_lang;
 			$db_data['user_lang'] = $user_lang;
@@ -321,7 +323,7 @@ foreach ($profile_fields as $field => $can_edit)
 	*/
 	case 'user_timezone':
 		$user_timezone = isset($_POST['user_timezone']) ? (int) $_POST['user_timezone'] : $pr_data['user_timezone'];
-		if ($submit && $user_timezone != $pr_data['user_timezone'])
+		if ($submit && ($user_timezone != $pr_data['user_timezone'] || $mode == 'register'))
 		{
 			if (isset($lang['TZ'][$user_timezone]))
 			{
diff --git a/upload/templates/default/usercp_register.tpl b/upload/templates/default/usercp_register.tpl
index f81d061f7..478e01011 100644
--- a/upload/templates/default/usercp_register.tpl
+++ b/upload/templates/default/usercp_register.tpl
@@ -54,7 +54,7 @@ ajax.callback.user_register = function(data){
 <!-- IF CAPTCHA_HTML -->
 <tr>
 	<td>{L_CONFIRM_CODE}:</td>
-	<td><span id="refresh_captcha">{CAPTCHA_HTML}</span> <img src="/images/pic_loading.gif" title="{L_UPDATE}" onclick="ajax.exec({ action: 'user_register', mode: 'refresh_captcha'}); return false;"></td>
+	<td><span id="refresh_captcha">{CAPTCHA_HTML}</span> <img align="middle" src="/images/pic_loading.gif" title="{L_UPDATE}" onclick="ajax.exec({ action: 'user_register', mode: 'refresh_captcha'}); return false;"></td>
 </tr>
 <!-- ENDIF -->
 <!-- IF EDIT_PROFILE -->