From 72f9c66f146af21f4485d2a2a29b3da29ff7f252 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 25 Apr 2019 16:21:45 +0200 Subject: [PATCH] * iMip/Mail/Calendar: fix event-doublication on accepting, if the event was deleted once caused by the deleted event was returned first and then ignored by calendar_ui::meeting --- calendar/inc/class.calendar_so.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php index e70f549a9a..86ec17e8fb 100644 --- a/calendar/inc/class.calendar_so.inc.php +++ b/calendar/inc/class.calendar_so.inc.php @@ -366,6 +366,9 @@ class calendar_so } $cols .= ',range_end-1 AS recur_enddate'; + // sort deleted to the end, to prefer non-deleted events over deleted ones when querying by uid + $group_by .= ' ORDER BY cal_deleted IS NOT NULL,egw_cal.cal_id DESC'; + $events =& $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date); // if we wanted to read the real recurrence, but we have eg. only a virtual one, we need to try again without $read_recurrence