From a059beb8331e75b48badce1070cdc145b3b9d3f3 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 9 Feb 2008 21:20:55 +1300 Subject: [PATCH] When creating a fake event, don't create a blank RRULE. --- inc/caldav-GET.php | 5 +++-- inc/caldav-REPORT.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/inc/caldav-GET.php b/inc/caldav-GET.php index 7b21f8a3..d95c223b 100644 --- a/inc/caldav-GET.php +++ b/inc/caldav-GET.php @@ -61,9 +61,10 @@ else if ( $qry->rows > 1 ) { // if the event is confidential we fake one that just says "Busy" $confidential = new iCalendar( array( 'SUMMARY' => translate('Busy'), 'CLASS' => 'CONFIDENTIAL', - 'DTSTART' => $ical->Get('DTSTART'), - 'RRULE' => $ical->Get('RRULE') + 'DTSTART' => $ical->Get('DTSTART') ) ); + $rrule = $ical->Get('RRULE'); + if ( isset($rrule) && $rrule != '' ) $confidential->Set('RRULE', $rrule); $duration = $ical->Get('DURATION'); if ( isset($duration) && $duration != "" ) { $confidential->Set('DURATION', $duration ); diff --git a/inc/caldav-REPORT.php b/inc/caldav-REPORT.php index 79bedf80..3e63408a 100644 --- a/inc/caldav-REPORT.php +++ b/inc/caldav-REPORT.php @@ -77,9 +77,10 @@ function calendar_to_xml( $properties, $item ) { // if the event is confidential we fake one that just says "Busy" $confidential = new iCalendar( array( 'SUMMARY' => translate('Busy'), 'CLASS' => 'CONFIDENTIAL', - 'DTSTART' => $ical->Get('DTSTART'), - 'RRULE' => $ical->Get('RRULE') + 'DTSTART' => $ical->Get('DTSTART') ) ); + $rrule = $ical->Get('RRULE'); + if ( isset($rrule) && $rrule != '' ) $confidential->Set('RRULE', $rrule); $duration = $ical->Get('DURATION'); if ( isset($duration) && $duration != "" ) { $confidential->Set('DURATION', $duration );