Request 2138 (superseded)

Overview

Request 2138 (superseded)

Actually check in the patch

Created by vanmeeuwen over 7 years ago
In state superseded
Supersedes 2137
Superseded by 2139
Open review for Admin
Open review for vanmeeuwen

Submit roundcubemail-plugins-kolab

Submit package Kolab:Winterfell / roundcubema...gins-kolab to package Kolab:16 / roundcubemail-plugins-kolab

0002-Workaround-libkolabxml-error-on-Etc-UTC-timezone-Bif.patch Added

@@ -0,0 +1,26 @@
+From 02d375972470e30b487532a0ba663a7851af7290 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Fri, 6 Oct 2017 08:32:58 +0200
+Subject: [PATCH 2/2] Workaround libkolabxml error on Etc/UTC timezone
+ (Bifrost#T43830)
+
+---
+ plugins/libkolab/lib/kolab_format.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
+index 814800d2..4f55a502 100644
+--- a/plugins/libkolab/lib/kolab_format.php
++++ b/plugins/libkolab/lib/kolab_format.php
+@@ -235,7 +235,7 @@ abstract class kolab_format
+                 $result->setTime($datetime->format('G'), $datetime->format('i'), $datetime->format('s'));
+ 
+             // libkolabxml throws errors on some deprecated timezone names
+-            $utc_aliases = array('UTC', 'GMT', '+00:00', 'Z', 'Etc/GMT');
++            $utc_aliases = array('UTC', 'GMT', '+00:00', 'Z', 'Etc/GMT', 'Etc/UTC');
+ 
+             if ($tz && in_array($tz->getName(), $utc_aliases)) {
+                 $result->setUTC(true);
+-- 
+2.14.1
+

Build Results
RPM Lint

Refresh

Comments for request 2138 0

Request History

vanmeeuwen created request over 7 years ago

Actually check in the patch

vanmeeuwen superseded request over 7 years ago

superseded by 2139