Branch 'roundcubemail-plugins-kolab-3.1' - plugins/libcalendaring

Thomas Brüderli bruederli at kolabsys.com
Tue Jan 14 11:27:55 CET 2014


 plugins/libcalendaring/lib/Sabre/VObject/Property.php |    9 +++++++++
 plugins/libcalendaring/lib/get_sabre_vobject.sh       |    2 ++
 2 files changed, 11 insertions(+)

New commits:
commit f7ca944b4bdb973acdca335761338f94df65c5c0
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Jan 14 11:23:52 2014 +0100

    Include patched version of Sabre\VObject\Property (#2442)

diff --git a/plugins/libcalendaring/lib/Sabre/VObject/Property.php b/plugins/libcalendaring/lib/Sabre/VObject/Property.php
index ad54146..18f8359 100644
--- a/plugins/libcalendaring/lib/Sabre/VObject/Property.php
+++ b/plugins/libcalendaring/lib/Sabre/VObject/Property.php
@@ -193,6 +193,15 @@ class Property extends Node {
             '\\\\',
             '\n',
         );
+
+        // avoid double-escaping of \, and \; from Compound properties
+        if (method_exists($this, 'setParts')) {
+            $src[] = '\\\\,';
+            $out[] = '\\,';
+            $src[] = '\\\\;';
+            $out[] = '\\;';
+        }
+
         $str.=':' . str_replace($src, $out, $this->value);
 
         $out = '';
diff --git a/plugins/libcalendaring/lib/get_sabre_vobject.sh b/plugins/libcalendaring/lib/get_sabre_vobject.sh
index 6cff8d2..f8c88c8 100755
--- a/plugins/libcalendaring/lib/get_sabre_vobject.sh
+++ b/plugins/libcalendaring/lib/get_sabre_vobject.sh
@@ -8,3 +8,5 @@ tar xf sabre-vobject-2.1.0.tar.gz
 mv sabre-vobject-2.1.0/lib/* .
 rm -rf sabre-vobject-2.1.0
 
+cd lib/Sabre/VObject && wget --no-check-certificate -O Property.php https://raw2.github.com/thomascube/sabre-vobject/84b64c65f9a94f7ec5a5e327bab3cc1335dd613c/lib/Sabre/VObject/Property.php
+




More information about the commits mailing list