From 64233d21890da61b4052f4ffd6bc34e4a83f5bc6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 29 Aug 2010 03:06:20 -0400
Subject: [PATCH] - Fix timezone string in sent mail (#1486961)
---
CHANGELOG | 1 +
program/steps/mail/func.inc | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index bd171d6..61d434d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@
- 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 a87b784..1509f90 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1602,7 +1602,8 @@
$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;
}
--
Gitblit v1.9.1