nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-30 18:37:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/calquery-finish-typo' into 'master'

Browse Source 
calquery: fix $end/$finish typo that disabled the SQL end filter

See merge request davical-project/davical!150
This commit is contained in:
jul2026v2 2026-07-29 07:04:54 +00:00
commit de1b531748
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/caldav-REPORT-calquery.php
View File

@ -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)";
}