diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-14 02:14:48 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-14 02:14:48 +0200 |
| commit | 528816dcbd23ace73d0d269844eaadd6630c9463 (patch) | |
| tree | 94c74d7b225b67457865f0e48c52a760e1b8ab08 /phpBB/includes | |
| parent | b3bbe576035da528aa6e52775cbc60133a8a2c90 (diff) | |
| parent | 3e9d15a25d21197a8bb9336058219bbfe4bd2d0a (diff) | |
| download | forums-528816dcbd23ace73d0d269844eaadd6630c9463.tar forums-528816dcbd23ace73d0d269844eaadd6630c9463.tar.gz forums-528816dcbd23ace73d0d269844eaadd6630c9463.tar.bz2 forums-528816dcbd23ace73d0d269844eaadd6630c9463.tar.xz forums-528816dcbd23ace73d0d269844eaadd6630c9463.zip | |
Merge branch 'ticket/bantu/9176' into develop-olympus
* ticket/bantu/9176:
[ticket/9176] Take current board timezone settings into account when setting board date format.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index a5feac1902..7680d8996c 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -888,8 +888,8 @@ class acp_board $old_tz = $user->timezone; $old_dst = $user->dst; - $user->timezone = $config['board_timezone']; - $user->dst = $config['board_dst']; + $user->timezone = $config['board_timezone'] * 3600; + $user->dst = $config['board_dst'] * 3600; $dateformat_options = ''; |
