diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-01-23 20:06:44 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-01-23 20:06:44 +0100 |
| commit | 2ae6b8a5eda3425c1798c11d3b663205eaf2f07e (patch) | |
| tree | 7e0fb2f7e33e56ec7f03764c4e9aa354b110ced2 | |
| parent | 1628a28e0c41e925d50082d94b5282b81904e863 (diff) | |
| parent | 2cf586a37206df3528237a2c91e255539c95a513 (diff) | |
| download | forums-2ae6b8a5eda3425c1798c11d3b663205eaf2f07e.tar forums-2ae6b8a5eda3425c1798c11d3b663205eaf2f07e.tar.gz forums-2ae6b8a5eda3425c1798c11d3b663205eaf2f07e.tar.bz2 forums-2ae6b8a5eda3425c1798c11d3b663205eaf2f07e.tar.xz forums-2ae6b8a5eda3425c1798c11d3b663205eaf2f07e.zip | |
Merge remote-tracking branch 'Dickyf/ticket/10580' into develop-olympus
* Dickyf/ticket/10580:
[ticket/10580] Remove checking of server timezone and DST when registering
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 4e8729db56..6ad3a55589 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -165,24 +165,8 @@ class ucp_register $captcha->init(CONFIRM_REG); } - // Try to manually determine the timezone and adjust the dst if the server date/time complies with the default setting +/- 1 - $timezone = date('Z') / 3600; - $is_dst = date('I'); - - if ($config['board_timezone'] == $timezone || $config['board_timezone'] == ($timezone - 1)) - { - $timezone = ($is_dst) ? $timezone - 1 : $timezone; - - if (!isset($user->lang['tz_zones'][(string) $timezone])) - { - $timezone = $config['board_timezone']; - } - } - else - { - $is_dst = $config['board_dst']; - $timezone = $config['board_timezone']; - } + $is_dst = $config['board_dst']; + $timezone = $config['board_timezone']; $data = array( 'username' => utf8_normalize_nfc(request_var('username', '', true)), |