makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10580] Remove checking of server timezone and DST when registering
This commit is contained in:
Andreas Fischer 2012-01-23 20:07:03 +01:00
commit 522090ab28
1 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/includes/ucp/ucp_register.php
View file

@ -164,24 +164,8 @@ class ucp_register
$captcha->init(CONFIRM_REG); $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 $is_dst = $config['board_dst'];
$timezone = date('Z') / 3600; $timezone = $config['board_timezone'];
$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'];
}
$data = array( $data = array(
'username' => utf8_normalize_nfc(request_var('username', '', true)), 'username' => utf8_normalize_nfc(request_var('username', '', true)),