mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
[ticket/10580] Remove checking of server timezone and DST when registering
Remove checking of server timezone and DST. It causes a problem by selecting the wrong timezone when registering when the board_timezone is 1 hour less than the server timezone. PHPBB3-10580
This commit is contained in:
parent
d7aa3aab5e
commit
2cf586a372
1 changed files with 2 additions and 18 deletions
|
@ -165,24 +165,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)),
|
||||||
|
|
Loading…
Add table
Reference in a new issue