[Svn] r3918 - in trunk/roundcubemail: . program/steps/mail

trac at roundcube.net trac at roundcube.net
Sun Aug 29 09:06:23 CEST 2010


Author: alec
Date: 2010-08-29 02:06:20 -0500 (Sun, 29 Aug 2010)
New Revision: 3918

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/steps/mail/func.inc
Log:
- Fix timezone string in sent mail (#1486961)


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2010-08-28 17:58:14 UTC (rev 3917)
+++ trunk/roundcubemail/CHANGELOG	2010-08-29 07:06:20 UTC (rev 3918)
@@ -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
 -----------

Modified: trunk/roundcubemail/program/steps/mail/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/func.inc	2010-08-28 17:58:14 UTC (rev 3917)
+++ trunk/roundcubemail/program/steps/mail/func.inc	2010-08-29 07:06:20 UTC (rev 3918)
@@ -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;
 }

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list