From 738cdb70176e67e6d4cc0635e7a9e261e26af1c9 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Tue, 10 Mar 2015 13:54:36 +0100
Subject: [PATCH] Adapt database driver to this-and-future cancellations from
 commit 1019238

---
 plugins/calendar/drivers/database/database_driver.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index 2b183521..14a88914 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -892,6 +892,7 @@ class database_driver extends calendar_driver
       $master = $event;
       $update_master = false;
       $savemode = 'all';
+      $ret = true;
 
       // read master if deleting a recurring event
       if ($event['recurrence'] || $event['recurrence_id']) {
@@ -933,6 +934,7 @@ class database_driver extends calendar_driver
               $fromdate->format(self::DB_DATE_FORMAT),
               $master['id']
             );
+            $ret = $master['id'];
             break;
           }
           // else: future == all if modifying the master event
@@ -952,7 +954,7 @@ class database_driver extends calendar_driver
       if ($success && $update_master)
         $this->_update_event($master, true);
 
-      return $success;
+      return $success ? $ret : false;
     }
     
     return false;