aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2008-03-06 19:29:59 +0000
committerNils Adermann <naderman@naderman.de>2008-03-06 19:29:59 +0000
commit33ab3d4439773cca96e40c707f302b193c22edf9 (patch)
tree6761c6bd633a67ba2593336afa37d6a78eba5959
parent2d30ffb9b699923e9073678ba32a7cea5603d328 (diff)
downloadforums-33ab3d4439773cca96e40c707f302b193c22edf9.tar
forums-33ab3d4439773cca96e40c707f302b193c22edf9.tar.gz
forums-33ab3d4439773cca96e40c707f302b193c22edf9.tar.bz2
forums-33ab3d4439773cca96e40c707f302b193c22edf9.tar.xz
forums-33ab3d4439773cca96e40c707f302b193c22edf9.zip
Custom profile fields with date type should be timezone independend [Bug #15003]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8424 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_profile_fields.php3
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index d75b841962..9c7a3fb7cf 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -131,6 +131,7 @@
<li>[Change] Added sanity checks to various ACP settings</li>
<li>[Change] Removed minimum form times</li>
<li>[Fix] Check topics_per_page value in acp_forums (Bug #15539)</li>
+ <li>[Fix] Custom profile fields with date type should be timezone independend (Bug #15003)</li>
</ul>
<a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3>
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 3797166429..b621095df4 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -488,7 +488,8 @@ class custom_profile
else if ($day && $month && $year)
{
global $user;
- return $user->format_date(mktime(0, 0, 0, $month, $day, $year), $user->lang['DATE_FORMAT'], true);
+ // d/m/y 00:00 GMT isn't necessarily on the same d/m/y in the user's timezone, so add the timezone seconds
+ return $user->format_date(gmmktime(0, 0, 0, $month, $day, $year) + $user->timezone + $user->dst, $user->lang['DATE_FORMAT'], true);
}
return $value;