From 4aef054ec9d7f66fdc947b602a02ba9c76fd77aa Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Thu, 25 Oct 2018 10:08:46 -0600
Subject: [PATCH] * Calendar - fix recurring events were left out of merge from
 list

---
 calendar/inc/class.calendar_uilist.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
index 6e3ddb7d19..b14d96b10d 100644
--- a/calendar/inc/class.calendar_uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -597,7 +597,8 @@ class calendar_uilist extends calendar_ui
 			$this->get_rows($query,$events,$readonlys);
 			foreach($events as $key => $event)
 			{
-				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]);
+				$recur_date = Api\DateTime::to($event['recur_date'],'ts');
+				if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$recur_date, $checked)) unset($events[$key]);
 			}
 			$checked = array_values($events); // Clear keys
 		}