diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-04 22:39:35 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-06-18 15:08:14 +0200 |
| commit | 66ae9ee2ea8b65ddb4c39b4bc9add8d2aca2e73d (patch) | |
| tree | 9e1b520f63d34fb4b7f510b7bbcc9aeaa9f3d9be /phpBB/includes | |
| parent | 09499fb128802bd19cee1550bf6e9af80a9388e2 (diff) | |
| download | forums-66ae9ee2ea8b65ddb4c39b4bc9add8d2aca2e73d.tar forums-66ae9ee2ea8b65ddb4c39b4bc9add8d2aca2e73d.tar.gz forums-66ae9ee2ea8b65ddb4c39b4bc9add8d2aca2e73d.tar.bz2 forums-66ae9ee2ea8b65ddb4c39b4bc9add8d2aca2e73d.tar.xz forums-66ae9ee2ea8b65ddb4c39b4bc9add8d2aca2e73d.zip | |
[feature/new-tz-handling] Fix timezone selection on registration page
PHPBB3-9558
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 5d85029e62..aee55711b2 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -100,7 +100,7 @@ class ucp_register 'username' => utf8_normalize_nfc(request_var('username', '', true)), 'email' => strtolower(request_var('email', '')), 'lang' => $user->lang_name, - 'tz' => request_var('tz', (float) $config['board_timezone']), + 'tz' => request_var('tz', $config['board_timezone']), )); } @@ -172,7 +172,7 @@ class ucp_register 'password_confirm' => request_var('password_confirm', '', true), 'email' => strtolower(request_var('email', '')), 'lang' => basename(request_var('lang', $user->lang_name)), - 'tz' => request_var('tz', (float) $timezone), + 'tz' => request_var('tz', $timezone), ); // Check and initialize some variables if needed @@ -189,7 +189,7 @@ class ucp_register 'email' => array( array('string', false, 6, 60), array('email')), - 'tz' => array('num', false, -14, 14), + 'tz' => array('timezone'), 'lang' => array('language_iso_name'), )); @@ -279,7 +279,7 @@ class ucp_register 'user_password' => phpbb_hash($data['new_password']), 'user_email' => $data['email'], 'group_id' => (int) $group_id, - 'user_timezone' => (float) $data['tz'], + 'user_timezone' => $data['tz'], 'user_dst' => $is_dst, 'user_lang' => $data['lang'], 'user_type' => $user_type, @@ -453,7 +453,7 @@ class ucp_register 'L_PASSWORD_EXPLAIN' => $user->lang($config['pass_complex'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_pass_chars']), $user->lang('CHARACTERS', (int) $config['max_pass_chars'])), 'S_LANG_OPTIONS' => language_select($data['lang']), - 'S_TZ_OPTIONS' => tz_select($data['tz']), + 'S_TZ_OPTIONS' => tz_select($data['tz'], true), 'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false, 'S_REGISTRATION' => true, 'S_COPPA' => $coppa, |