2 commits - plugins/libkolab

Thomas Brüderli bruederli at kolabsys.com
Wed Nov 6 10:58:09 CET 2013


 plugins/libkolab/lib/kolab_format.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 60b9d544adef7485b0c15f3e5b09e84adee994b4
Merge: 91f32da 4090c49
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Nov 6 10:58:01 2013 +0100

    Merge branch 'master' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab



commit 91f32da8d17b24ea8596825f9ca408f18d82719d
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Nov 6 09:42:23 2013 +0100

    Define aliases for UTC timezone

diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
index aa88f69..9dc8a31 100644
--- a/plugins/libkolab/lib/kolab_format.php
+++ b/plugins/libkolab/lib/kolab_format.php
@@ -123,7 +123,7 @@ abstract class kolab_format
             if (!$dateonly)
                 $result->setTime($datetime->format('G'), $datetime->format('i'), $datetime->format('s'));
 
-            if ($tz && $tz->getName() == 'UTC')
+            if ($tz && in_array($tz->getName(), array('UTC','GMT','+00:00')))
                 $result->setUTC(true);
             else if ($tz !== false)
                 $result->setTimezone($tz->getName());




More information about the commits mailing list