From a47407f7c85a81b6d5b7f5b5119a95dbfe711552 Mon Sep 17 00:00:00 2001 From: Robert Rollins Date: Mon, 25 Apr 2016 10:38:05 -0700 Subject: [PATCH] Issue #2710961: Long lists of Exclusion Dates now parse properly on import. --- libraries/ParserVcalendar.inc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libraries/ParserVcalendar.inc b/libraries/ParserVcalendar.inc index 9c18abb..103aa84 100644 --- a/libraries/ParserVcalendar.inc +++ b/libraries/ParserVcalendar.inc @@ -498,15 +498,14 @@ class ParserVcalendar { } } - $rrule = trim($vcalendar_component->createRrule()); + # Due to a bug in iCalcreator 2.20.2, any repeat property that's too long to fit on one line will be returned + # verbatim, including the endline and the single-space indentation that starts the second line. Thus, we need to + # remove those things ourselves. + $rrule = trim(preg_replace('/\s/', '', $vcalendar_component->createRrule())); + $rdate = trim(preg_replace('/\s/', '', $vcalendar_component->createRdate())); + $exrule = trim(preg_replace('/\s/', '', $vcalendar_component->createExrule())); + $exdate = trim(preg_replace('/\s/', '', $vcalendar_component->createExdate())); - # Due to a bug in iCalcreator 2.20.2, any RRULE that's too long to fit on one line will be returned without - # the endline and second-line indentation removed. Thus, we need to do it ourselves. - $rrule = preg_replace('/\s/', '', $rrule); - - $rdate = trim($vcalendar_component->createRdate()); - $exrule = trim($vcalendar_component->createExrule()); - $exdate = trim($vcalendar_component->createExdate()); return "$rrule|$rdate|$exrule|$exdate"; } -- 2.26.2