diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-04 23:28:48 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-06-18 15:08:46 +0200 |
| commit | 3c6272ff0475dc19cc67553f370ce227214d0613 (patch) | |
| tree | d7abf3d7b6ca6fe97c2dca9ee551d491fa460756 /phpBB/includes/user.php | |
| parent | 963d4afc2cf5fb2903ed02ada20cdbf0188d57db (diff) | |
| download | forums-3c6272ff0475dc19cc67553f370ce227214d0613.tar forums-3c6272ff0475dc19cc67553f370ce227214d0613.tar.gz forums-3c6272ff0475dc19cc67553f370ce227214d0613.tar.bz2 forums-3c6272ff0475dc19cc67553f370ce227214d0613.tar.xz forums-3c6272ff0475dc19cc67553f370ce227214d0613.zip | |
[feature/new-tz-handling] Remove appearances of board_dst and user_dst
PHPBB3-9558
Diffstat (limited to 'phpBB/includes/user.php')
| -rw-r--r-- | phpBB/includes/user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php index 4c62dd93d7..a36d837fbd 100644 --- a/phpBB/includes/user.php +++ b/phpBB/includes/user.php @@ -126,7 +126,7 @@ class phpbb_user extends phpbb_session if (is_numeric($this->tz)) { // Might still be numeric by chance - $this->tz = sprintf('Etc/GMT%+d', ($this->tz + ($this->data['user_id'] != ANONYMOUS ? $this->data['user_dst'] : $config['board_dst']))); + $this->tz = sprintf('Etc/GMT%+d', $this->tz); } $this->tz = new DateTimeZone($this->tz); |