From fc296f3ed1d9a0eb6bc31dd3fc4d190de97b4d97 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 12 Mar 2020 09:18:30 -0600
Subject: [PATCH] Calendar: Fix some cases where a changed participant status
 would not remove the event when it should

---
 calendar/inc/class.calendar_ui.inc.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 50576ea5fd..3c5ee71bd9 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -11,10 +11,10 @@
  */
 
 use EGroupware\Api;
-use EGroupware\Api\Framework;
-use EGroupware\Api\Egw;
 use EGroupware\Api\Acl;
+use EGroupware\Api\Egw;
 use EGroupware\Api\Etemplate;
+use EGroupware\Api\Framework;
 
 /**
  * Shared base-class of all calendar UserInterface classes
@@ -667,7 +667,12 @@ class calendar_ui
 		if(!$event || !$filter_match)
 		{
 			// Sending null will trigger a removal
-			$response->generic('data', array('uid' => 'calendar::'.$event_id, 'data' => null));
+			$uid = 'calendar::' . $event_id;
+			if ($recurrence_date)
+			{
+				$uid .= ':' . $recurrence_date->getTimestamp();
+			}
+			$response->generic('data', array('uid' => $uid, 'data' => null));
 			return false;
 		}