From d5af9a5e2c5b374503f336fe015af8c1ad383c8a Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 7 Oct 2012 17:10:36 +0000 Subject: [PATCH] * Calendar/CalDAV: fixed not working update/delete of recurring event containing exceptions (always gave 412 Precondition Failed) because recur_exceptions were not read on search --- calendar/inc/class.calendar_so.inc.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php index 1722e4a5fa..1e7ec789a2 100644 --- a/calendar/inc/class.calendar_so.inc.php +++ b/calendar/inc/class.calendar_so.inc.php @@ -735,10 +735,7 @@ class calendar_so 'recur_exception' => true, ), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_start', 'calendar') as $row) { - foreach((array)$recur_ids[$row['cal_id']] as $i) - { - $events[$i]['recurce_id'][] = $row['cal_start']; - } + $events[$row['cal_id']]['recur_exception'][] = $row['cal_start']; } } //custom fields are not shown in the regular views, so we only query them, if explicitly required