holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar - Fix 1 day holidays with duration specified as P1D spanning 2 days

Browse Source
This commit is contained in:
nathangray 2017-06-09 15:28:06 -06:00
parent 423caf7be2
commit bd8dd18b12
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/inc/class.calendar_ical.inc.php
View File

@ -2417,6 +2417,13 @@ class calendar_ical extends calendar_boupdate
// No reference or RECURRENCE-ID for the series master // No reference or RECURRENCE-ID for the series master
$event['reference'] = $event['recurrence'] = 0; $event['reference'] = $event['recurrence'] = 0;
} }
if (Api\DateTime::to($event['start'], 'H:i:s') == '00:00:00' && Api\DateTime::to($event['end'], 'H:i:s') == '00:00:00'
&& $event['end'] - $event['start'] == 86400
)
{
// 'All day' event that ends at midnight the next day, avoid that
$event['end']--;
}
// handle the alarms // handle the alarms
$alarms = $event['alarm']; $alarms = $event['alarm'];