From 3cc0012c77c6d88e0759f60a557959d06d999e0e Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 21 Sep 2017 15:19:07 +0200 Subject: [PATCH] * CalDAV: fix not parsed recurrence exceptions caused by newer Horde Icalendar class always importing them as date --- calendar/inc/class.calendar_ical.inc.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index 1af5c9b723..c46d3adec0 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -2781,11 +2781,8 @@ class calendar_ical extends calendar_boupdate break; } break; - case 'EXDATE': - if (!$attributes['value']) break; - if ((isset($attributes['params']['VALUE']) - && $attributes['params']['VALUE'] == 'DATE') || - (!isset($attributes['params']['VALUE']) && $isDate)) + case 'EXDATE': // current Horde_Icalendar returns dates, no timestamps + if ($attributes['values']) { $days = array(); $hour = date('H', $vcardData['start']); @@ -2803,10 +2800,6 @@ class calendar_ical extends calendar_boupdate } $vcardData['recur_exception'] = array_merge($vcardData['recur_exception'], $days); } - else - { - $vcardData['recur_exception'] = array_merge($vcardData['recur_exception'], $attributes['values']); - } break; case 'SUMMARY': $vcardData['title'] = str_replace("\r\n", "\n", $attributes['value']);