diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-07-18 14:56:42 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-07-18 15:01:29 +0200 |
| commit | 515e1662a900526342b595692d73372f4fb7bbf9 (patch) | |
| tree | fa60a81726a2e7691e8f036915903c311d7a94f5 /phpBB | |
| parent | 8078a04f3a3816b4515da01eb3635ae8141db26b (diff) | |
| download | forums-515e1662a900526342b595692d73372f4fb7bbf9.tar forums-515e1662a900526342b595692d73372f4fb7bbf9.tar.gz forums-515e1662a900526342b595692d73372f4fb7bbf9.tar.bz2 forums-515e1662a900526342b595692d73372f4fb7bbf9.tar.xz forums-515e1662a900526342b595692d73372f4fb7bbf9.zip | |
[feature/new-tz-handling] Remove "timezone might be numeric"
As we updated all of the used values, there really shouldn't be one anymore.
PHPBB3-9558
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/user.php | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 159435c64c..47a08b0bab 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -916,11 +916,6 @@ class acp_board // Let the format_date function operate with the acp values $old_tz = $user->tz; - if (is_numeric($config['board_timezone'])) - { - // Might still be numeric - $config['board_timezone'] = sprintf('Etc/GMT%+d', $config['board_timezone']); - } $user->tz = new DateTimeZone($config['board_timezone']); $dateformat_options = ''; diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php index fb6c1552e8..c3bdc71774 100644 --- a/phpBB/includes/user.php +++ b/phpBB/includes/user.php @@ -127,12 +127,6 @@ class phpbb_user extends phpbb_session */ } - if (is_numeric($user_timezone)) - { - // Might still be numeric - $user_timezone = sprintf('Etc/GMT%+d', $user_timezone); - } - $this->tz = new DateTimeZone($user_timezone); // We include common language file here to not load it every time a custom language file is included |