diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-08-29 07:06:20 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-08-29 07:06:20 +0000 |
| commit | c60a1043cab3743be59e370d83823064e9c21616 (patch) | |
| tree | 2416d5f4f86753de1af97310c13a8cbc1f050f42 | |
| parent | f9ad6205bb83daf96427d55aef1abcd351d7e12c (diff) | |
- Fix timezone string in sent mail (#1486961)
git-svn-id: https://svn.roundcube.net/trunk@3918 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index bd171d6df..61d434d12 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -15,6 +15,7 @@ CHANGELOG RoundCube Webmail - Fix JS error on IE when trying to send HTML message with enabled spellchecker (#1486940) - Display inline images with known extensions and non-image content-type (#1486934) - Fix "Threaded" checkbox after subfolder creation (#1486928) +- Fix timezone string in sent mail (#1486961) RELEASE 0.4 ----------- diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index a87b7848b..1509f9028 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -1602,7 +1602,8 @@ function rcmail_user_date() $date = time() + $tz * 60 * 60; $date = gmdate('r', $date); - $date = preg_replace('/[+-][0-9]{4}$/', sprintf('%+05d', $tz * 100), $date); + $tz = sprintf('%+05d', intval($tz) * 100 + ($tz - intval($tz)) * 60); + $date = preg_replace('/[+-][0-9]{4}$/', $tz, $date); return $date; } |