diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-01-23 20:07:03 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-01-23 20:07:03 +0100 |
| commit | 522090ab2821e0861304ecbcfc6ac26a5b5faeff (patch) | |
| tree | 8731b40e0914a635f0c372352c02e1790708e136 | |
| parent | 11f0984d877692efda2b614be0316da8baa78315 (diff) | |
| parent | 2ae6b8a5eda3425c1798c11d3b663205eaf2f07e (diff) | |
| download | forums-522090ab2821e0861304ecbcfc6ac26a5b5faeff.tar forums-522090ab2821e0861304ecbcfc6ac26a5b5faeff.tar.gz forums-522090ab2821e0861304ecbcfc6ac26a5b5faeff.tar.bz2 forums-522090ab2821e0861304ecbcfc6ac26a5b5faeff.tar.xz forums-522090ab2821e0861304ecbcfc6ac26a5b5faeff.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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 f3ce674c3a..91729c7844 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -164,24 +164,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)), |