From cf037eec785449ce17477ee80e09f88fda42ff30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Margus=20V=C3=B6hrmann?= <bberski@gmail.com>
Date: Mon, 17 Jul 2017 19:01:14 +0200
Subject: [PATCH 1/2] Fix \;->; and \,->,

---
 libcalendaring/lib/OldSabre/VObject/Property.php | 2 ++
 libcalendaring/libvcalendar.php                  | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libcalendaring/lib/OldSabre/VObject/Property.php b/libcalendaring/lib/OldSabre/VObject/Property.php
index 97712e4..1710151 100644
--- a/libcalendaring/lib/OldSabre/VObject/Property.php
+++ b/libcalendaring/lib/OldSabre/VObject/Property.php
@@ -189,11 +189,13 @@ public function serialize() {
             '\\',
             "\n",
             "\r",
+            ',',
         );
         $out = array(
             '\\\\',
             '\n',
             '',
+            '\,',
         );
 
         // avoid double-escaping of \, and \; from Compound properties
diff --git a/libcalendaring/libvcalendar.php b/libcalendaring/libvcalendar.php
index 6a1d1ff..3c9ea7e 100644
--- a/libcalendaring/libvcalendar.php
+++ b/libcalendaring/libvcalendar.php
@@ -748,10 +748,14 @@ private function _parse_freebusy($ve)
 
     /**
      *
+        fix 
+        '\,' -> ','
+        '\;' -> ';'
      */
     public static function convert_string($prop)
     {
-        return str_replace('\,', ',', strval($prop->value));
+        return str_replace(array('\,','\;'),array(',',';'), strval($prop->value));
+
     }
 
     /**

From b0f6a9fba41d1aa5892dda76596265eab119c184 Mon Sep 17 00:00:00 2001
From: bberski <bberski@gmail.com>
Date: Sat, 22 Jul 2017 14:52:09 +0200
Subject: [PATCH 2/2] Fix duplicating the same attachemnt in events

---
 calendar/drivers/caldav/caldav_driver.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/calendar/drivers/caldav/caldav_driver.php b/calendar/drivers/caldav/caldav_driver.php
index db8f7a3..066cb30 100644
--- a/calendar/drivers/caldav/caldav_driver.php
+++ b/calendar/drivers/caldav/caldav_driver.php
@@ -1467,7 +1467,12 @@ public function dismiss_alarm($event_id, $snooze = 0)
      */
     private function add_attachment($attachment, $event_id)
     {
-        $data = $attachment['data'] ? $attachment['data'] : file_get_contents($attachment['path']);
+        if (isset($attachment['data']))
+            $data = $attachment['data'];
+        elseif (isset($attachment['path']) && $attachment['path'] != '')
+            $data = file_get_contents($attachment['path']);
+        else
+            return 0;
 
         $query = $this->rc->db->query(
             "INSERT INTO " . $this->db_attachments .