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/index.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/index.php')
| -rw-r--r-- | phpBB/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/index.php b/phpBB/index.php index 427377a2cd..419b66cfdb 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -84,7 +84,7 @@ $legend = implode(', ', $legend); $birthday_list = array(); if ($config['load_birthdays'] && $config['allow_birthdays']) { - $now = getdate(time() + $user->timezone + $user->dst - date('Z')); + $now = phpbb_gmgetdate(time() + $user->timezone + $user->dst); $sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday FROM ' . USERS_TABLE . ' u LEFT JOIN ' . BANLIST_TABLE . " b ON (u.user_id = b.ban_userid) |