nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-25 02:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't supply freebusy for 0-duration events.

Browse Source
This commit is contained in:
Andrew McMillan 2010-10-07 17:27:21 -04:00
parent 6c4e2de41b
commit d75b525cf4
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/freebusy-functions.php
View File

@ -65,7 +65,7 @@ function get_freebusy( $path_match, $range_start, $range_end, $bin_privs = null
$duration = ( !isset($duration) ? 'P1D' : $duration->Value()); $duration = ( !isset($duration) ? 'P1D' : $duration->Value());
$end_date = clone($start_date); $end_date = clone($start_date);
$end_date->modify( $duration ); $end_date->modify( $duration );
if ( $end_date < $range_start || $start_date > $range_end ) continue; if ( $end_date == $start_date || $end_date < $range_start || $start_date > $range_end ) continue;
$thisfb = $start_date->UTC() .'/'. $end_date->UTC() . $extra; $thisfb = $start_date->UTC() .'/'. $end_date->UTC() . $extra;
array_push( $fbtimes, $thisfb ); array_push( $fbtimes, $thisfb );
} }

2
testing/tests/regression-suite/0889-POST-freebusy.result
View File

@ -808,7 +808,6 @@ FREEBUSY:20071206T180000Z/20071207T040000Z
FREEBUSY:20071206T220000Z/20071206T230000Z FREEBUSY:20071206T220000Z/20071206T230000Z
FREEBUSY:20071207T220000Z/20071207T230000Z FREEBUSY:20071207T220000Z/20071207T230000Z
FREEBUSY:20071208T220000Z/20071208T230000Z FREEBUSY:20071208T220000Z/20071208T230000Z
FREEBUSY:20071209T003000Z/20071209T003000Z
FREEBUSY:20071209T180000Z/20071210T040000Z FREEBUSY:20071209T180000Z/20071210T040000Z
FREEBUSY:20071209T220000Z/20071209T230000Z FREEBUSY:20071209T220000Z/20071209T230000Z
FREEBUSY:20071210T180000Z/20071211T040000Z FREEBUSY:20071210T180000Z/20071211T040000Z
@ -1465,7 +1464,6 @@ FREEBUSY:20081118T180000Z/20081119T040000Z
FREEBUSY:20081119T180000Z/20081120T040000Z FREEBUSY:20081119T180000Z/20081120T040000Z
FREEBUSY:20081119T184500Z/20081119T193000Z FREEBUSY:20081119T184500Z/20081119T193000Z
FREEBUSY:20081120T180000Z/20081121T040000Z FREEBUSY:20081120T180000Z/20081121T040000Z
FREEBUSY:20081121T160000Z/20081122T160000Z
FREEBUSY:20081123T180000Z/20081124T040000Z FREEBUSY:20081123T180000Z/20081124T040000Z
FREEBUSY:20081124T180000Z/20081125T040000Z FREEBUSY:20081124T180000Z/20081125T040000Z
FREEBUSY:20081124T184500Z/20081124T193000Z FREEBUSY:20081124T184500Z/20081124T193000Z