diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-16 22:06:49 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-16 22:06:49 -0400 |
| commit | a33b67fd1a80463602c3603f72ad0f96dd3d9b09 (patch) | |
| tree | c5304bb4d38ddb3ee224cb0ddac32bd463d169d2 /phpBB/viewtopic.php | |
| parent | 19925ad059a31282467c061a76fb387d2206b357 (diff) | |
| parent | 0f86034f03c8b81883aed2345d88d197f72c7491 (diff) | |
| download | forums-a33b67fd1a80463602c3603f72ad0f96dd3d9b09.tar forums-a33b67fd1a80463602c3603f72ad0f96dd3d9b09.tar.gz forums-a33b67fd1a80463602c3603f72ad0f96dd3d9b09.tar.bz2 forums-a33b67fd1a80463602c3603f72ad0f96dd3d9b09.tar.xz forums-a33b67fd1a80463602c3603f72ad0f96dd3d9b09.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index c5189a04df..abfba42379 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -956,7 +956,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 |