diff options
| author | alecpl <alec@alec.pl> | 2010-08-29 07:06:20 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-08-29 07:06:20 +0000 |
| commit | 64233d21890da61b4052f4ffd6bc34e4a83f5bc6 (patch) | |
| tree | 2757c91417ee25068eb14955f10912d08dacc2df | |
| parent | 5cd00e2481c4e5b54b33f2f449bdc0454e4374c0 (diff) | |
- Fix timezone string in sent mail (#1486961)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -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/program/steps/mail/func.inc b/program/steps/mail/func.inc index a87b7848b..1509f9028 100644 --- a/program/steps/mail/func.inc +++ b/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; } |