diff --git a/inc/caldav-REPORT-calquery.php b/inc/caldav-REPORT-calquery.php index d5b2a84a..f484d7a1 100644 --- a/inc/caldav-REPORT-calquery.php +++ b/inc/caldav-REPORT-calquery.php @@ -318,8 +318,8 @@ if ( $qry->Exec("calquery",__LINE__,__FILE__) && $qry->rows() > 0 ) { $calendar_object->dav_name = str_replace( $bound_from, $target_collection->dav_name(), $calendar_object->dav_name); } if ( $need_expansion ) { - $ics = new iCalComponent($calendar_object->caldav_data); - $expanded = expand_event_instances($ics, $expand_range_start, $expand_range_end); + $vResource = new vComponent($calendar_object->caldav_data); + $expanded = expand_event_instances($vResource, $expand_range_start, $expand_range_end); $calendar_object->caldav_data = $expanded->Render(); } $responses[] = calendar_to_xml( $properties, $calendar_object ); diff --git a/inc/caldav-REPORT-multiget.php b/inc/caldav-REPORT-multiget.php index e58cd834..7631d5fb 100644 --- a/inc/caldav-REPORT-multiget.php +++ b/inc/caldav-REPORT-multiget.php @@ -104,8 +104,8 @@ if ( $qry->Exec('REPORT',__LINE__,__FILE__) && $qry->rows() > 0 ) { $dav_object->dav_name = str_replace( $bound_from, $collection->dav_name(), $dav_object->dav_name); } if ( $need_expansion ) { - $ics = new iCalComponent($dav_object->caldav_data); - $expanded = expand_event_instances($ics, $expand_range_start, $expand_range_end); + $vResource = new vComponent($dav_object->caldav_data); + $expanded = expand_event_instances($vResource, $expand_range_start, $expand_range_end); $dav_object->caldav_data = $expanded->Render(); } $responses[] = component_to_xml( $properties, $dav_object );