aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/memberlist.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-07-16 22:06:49 -0400
committerNils Adermann <naderman@naderman.de>2011-07-16 22:06:49 -0400
commita33b67fd1a80463602c3603f72ad0f96dd3d9b09 (patch)
treec5304bb4d38ddb3ee224cb0ddac32bd463d169d2 /phpBB/memberlist.php
parent19925ad059a31282467c061a76fb387d2206b357 (diff)
parent0f86034f03c8b81883aed2345d88d197f72c7491 (diff)
downloadforums-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/memberlist.php')
-rw-r--r--phpBB/memberlist.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 70d3ed9f37..418c1a4417 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1687,7 +1687,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f
if ($bday_year)
{
- $now = getdate(time() + $user->timezone + $user->dst - date('Z'));
+ $now = phpbb_gmgetdate(time() + $user->timezone + $user->dst);
$diff = $now['mon'] - $bday_month;
if ($diff == 0)