diff --git a/inc/caldav-REPORT-calquery.php b/inc/caldav-REPORT-calquery.php index c0ec60a9..e7d8ea59 100644 --- a/inc/caldav-REPORT-calquery.php +++ b/inc/caldav-REPORT-calquery.php @@ -232,16 +232,16 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter = $new_start_cond = "last_instance_end IS NULL OR last_instance_end >= :time_range_start"; $new_end_cond = "first_instance_start <= :time_range_end"; - if (!isset($start) && !isset($end)) { + if (!isset($start) && !isset($finish)) { $legacy_cond = "true"; $new_cond = "true"; - } else if (!isset($start) && isset($end)) { + } else if (!isset($start) && isset($finish)) { $legacy_cond = $legacy_end_cond; $new_cond = $new_end_cond; - } else if (isset($start) && !isset($end)) { + } else if (isset($start) && !isset($finish)) { $legacy_cond = $legacy_start_cond; $new_cond = $new_start_cond; - } else if (isset($start) && isset($end)) { + } else if (isset($start) && isset($finish)) { $legacy_cond = "($legacy_end_cond) AND ($legacy_start_cond)"; $new_cond = "($new_end_cond) AND ($new_start_cond)"; }