Commit bd73a07f authored by unknown's avatar unknown

Fix the exclusive end day issue in a more efficient way.

parent 8a8e74ae
......@@ -224,7 +224,7 @@ function template_preprocess_views_view_fullcalendar(array &$variables) {
// Recurring event.
if (!empty($dow) || !empty($dom)) {
$format = 'H:i';
$range['end'] = $timezone_service->utcToLocal($end_date, $timezone, 'Y-m-d');
$range['end'] = $timezone_service->utcToLocal($end_date, $timezone, 'Y-m-d', '+1 day');
}
else {
$format = DATE_ATOM;
......
......@@ -32,7 +32,7 @@
}
// test event against all the ranges
if (range.end) {
return (event.start.isBefore(moment.utc(range.end,'YYYY-MM-DD').add(1, 'days')) &&
return (event.start.isBefore(moment.utc(range.end,'YYYY-MM-DD')) &&
event.end.isAfter(moment.utc(range.start,'YYYY-MM-DD')));
}
else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment