From 61037eb97c8580d385fc625db064f3855d8a823f Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Thu, 19 Feb 2015 15:56:46 +0100
Subject: [PATCH] Fix RSVP flag in iTip REQUESTS

---
 plugins/libcalendaring/lib/libcalendaring_itip.php | 4 ++--
 plugins/libkolab/lib/kolab_format_event.php        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php
index b4a7aee4..e7de5c89 100644
--- a/plugins/libcalendaring/lib/libcalendaring_itip.php
+++ b/plugins/libcalendaring/lib/libcalendaring_itip.php
@@ -250,8 +250,8 @@ class libcalendaring_itip
         // set RSVP for every attendee
         else if ($method == 'REQUEST') {
             foreach ($event['attendees'] as $i => $attendee) {
-                if ($attendee['status'] != 'DELEGATED') {
-                    $event['attendees'][$i]['rsvp']= $rsvp ? true : null;
+                if ($attendee['status'] != 'DELEGATED' && !isset($attendee['rsvp'])) {
+                    $event['attendees'][$i]['rsvp']= (bool)$rsvp;
                 }
             }
         }
diff --git a/plugins/libkolab/lib/kolab_format_event.php b/plugins/libkolab/lib/kolab_format_event.php
index 0c90e858..91efb26f 100644
--- a/plugins/libkolab/lib/kolab_format_event.php
+++ b/plugins/libkolab/lib/kolab_format_event.php
@@ -118,7 +118,7 @@ class kolab_format_event extends kolab_format_xcal
                 $vexceptions->push($exevent->obj);
 
                 // write cleaned-up exception data back to memory/cache
-                $object['recurrence']['EXCEPTIONS'][$i] = $this->expand_exception($compacted, $object);
+                $object['recurrence']['EXCEPTIONS'][$i] = $this->expand_exception($exevent->data, $object);
             }
             $this->obj->setExceptions($vexceptions);
         }