From cbbcba9a2d76636130525caa767aae5c0ef70ca2 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Tue, 14 Jan 2014 11:23:52 +0100 Subject: [PATCH] Include patched version of Sabre\VObject\Property (#2442) --- plugins/libcalendaring/lib/Sabre/VObject/Property.php | 9 +++++++++ plugins/libcalendaring/lib/get_sabre_vobject.sh | 2 ++ 2 files changed, 11 insertions(+) diff --git a/plugins/libcalendaring/lib/Sabre/VObject/Property.php b/plugins/libcalendaring/lib/Sabre/VObject/Property.php index 63ae6457..8be67e25 100644 --- a/plugins/libcalendaring/lib/Sabre/VObject/Property.php +++ b/plugins/libcalendaring/lib/Sabre/VObject/Property.php @@ -195,6 +195,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 6cff8d20..f8c88c81 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 +