diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:34:18 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:34:18 +0200 |
| commit | e4ff780c1370d9f743da0fffc70b98be0c7cfe92 (patch) | |
| tree | 00738becf05268632411007a93ff06407ca1917a /phpBB/includes/functions_profile_fields.php | |
| parent | c4a65a469709a8ffdeb52f9d3556545993f2347a (diff) | |
| parent | dbe8fb6488005c3295f839c7302a56f1de872426 (diff) | |
| download | forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.gz forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.bz2 forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.xz forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9117] Wrong redirection after login.
[ticket/9772] Unify permissions for sending email when board_email_form is off
[ticket/7369] CPF date should always render the users selection.
[ticket/7296] Exporting styles to tar creates corrupted archives.
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
Diffstat (limited to 'phpBB/includes/functions_profile_fields.php')
| -rw-r--r-- | phpBB/includes/functions_profile_fields.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index fa1cc98e10..3937cf9c21 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -543,8 +543,9 @@ class custom_profile else if ($day && $month && $year) { global $user; - // 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); + // Date should display as the same date for every user regardless of timezone, so remove offset + // to compensate for the offset added by user::format_date() + return $user->format_date(gmmktime(0, 0, 0, $month, $day, $year) - ($user->timezone + $user->dst), $user->lang['DATE_FORMAT'], true); } return $value; |