summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-08-29 07:06:20 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-08-29 07:06:20 +0000
commitc60a1043cab3743be59e370d83823064e9c21616 (patch)
tree2416d5f4f86753de1af97310c13a8cbc1f050f42 /roundcubemail/program
parentf9ad6205bb83daf96427d55aef1abcd351d7e12c (diff)
- Fix timezone string in sent mail (#1486961)
git-svn-id: https://svn.roundcube.net/trunk@3918 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/steps/mail/func.inc3
1 files changed, 2 insertions, 1 deletions
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;
}