aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-07-16 22:05:03 -0400
committerNils Adermann <naderman@naderman.de>2011-07-16 22:05:03 -0400
commit0f86034f03c8b81883aed2345d88d197f72c7491 (patch)
tree0529f9d57b59752d98a303321876d5ccc42e99e0 /phpBB/viewtopic.php
parentb3cdd1d16981c5992d1bffb97786084f9f02cad1 (diff)
parent0e85704d75c2edefdbdfb9d5542ab366744e65fb (diff)
downloadforums-0f86034f03c8b81883aed2345d88d197f72c7491.tar
forums-0f86034f03c8b81883aed2345d88d197f72c7491.tar.gz
forums-0f86034f03c8b81883aed2345d88d197f72c7491.tar.bz2
forums-0f86034f03c8b81883aed2345d88d197f72c7491.tar.xz
forums-0f86034f03c8b81883aed2345d88d197f72c7491.zip
Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympus
* github-bantu/ticket/10243: [ticket/10243] Adding a few unit tests for phpbb_gmgetdate(). [ticket/10243] Call phpbb_gmgetdate() from various places. [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 8b081b4aec..2f3a4cf2e4 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -995,7 +995,7 @@ $sql = $db->sql_build_query('SELECT', array(
$result = $db->sql_query($sql);
-$now = getdate(time() + $user->timezone + $user->dst - date('Z'));
+$now = phpbb_gmgetdate(time() + $user->timezone + $user->dst);
// Posts are stored in the $rowset array while $attach_list, $user_cache
// and the global bbcode_bitfield are built