summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-08-29 07:06:20 +0000
committeralecpl <alec@alec.pl>2010-08-29 07:06:20 +0000
commit64233d21890da61b4052f4ffd6bc34e4a83f5bc6 (patch)
tree2757c91417ee25068eb14955f10912d08dacc2df /program
parent5cd00e2481c4e5b54b33f2f449bdc0454e4374c0 (diff)
- Fix timezone string in sent mail (#1486961)
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/func.inc3
1 files changed, 2 insertions, 1 deletions
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;
}