aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-07-19 08:46:25 -0700
committerNils Adermann <naderman@naderman.de>2012-07-19 08:46:25 -0700
commit737828f00911ba145697ef4060401e50e5b711af (patch)
tree4ec7097ac7c5ffeb3b00c62d09ce9d5955a5c5d8 /phpBB/viewtopic.php
parentc896cd06dd8fba023e2ab6f9cd3f8293d382fb70 (diff)
parent7df1c84447903ecc97a8418339ec6933bdfc9035 (diff)
downloadforums-737828f00911ba145697ef4060401e50e5b711af.tar
forums-737828f00911ba145697ef4060401e50e5b711af.tar.gz
forums-737828f00911ba145697ef4060401e50e5b711af.tar.bz2
forums-737828f00911ba145697ef4060401e50e5b711af.tar.xz
forums-737828f00911ba145697ef4060401e50e5b711af.zip
Merge pull request #843 from nickvergessen/feature/new-tz-handling
Feature/new tz handling
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index c0dbc12fca..349f53cbe2 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -990,7 +990,8 @@ $sql_ary = array(
$sql = $db->sql_build_query('SELECT', $sql_ary);
$result = $db->sql_query($sql);
-$now = phpbb_gmgetdate(time() + $user->timezone + $user->dst);
+$now = $user->create_datetime();
+$now = phpbb_gmgetdate($now->getTimestamp() + $now->getOffset());
// Posts are stored in the $rowset array while $attach_list, $user_cache
// and the global bbcode_bitfield are built