Skip to content

Commit

Permalink
Merge pull request #2895 from buxxi/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
MichMich authored Aug 6, 2022
2 parents d539f45 + 17c14e1 commit 4d8fb8c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ _This release is scheduled to be released on 2022-10-01._

- Broadcast all calendar events while still honoring global and per-calendar maximumEntries.
- Respect rss ttl provided by newsfeed (#2883).
- Fix multi day calendar events always presented as "(1/X)" instead of the amount of days the event has progressed.

## [2.20.0] - 2022-07-02

Expand Down
4 changes: 0 additions & 4 deletions modules/default/calendar/calendarutils.js
Original file line number Diff line number Diff line change
Expand Up @@ -469,10 +469,6 @@ const CalendarUtils = {
return;
}

// Adjust start date so multiple day events will be displayed as happening today even though they started some days ago already
if (fullDayEvent && startDate <= today && endDate > today) {
startDate = moment(today);
}
// if the start and end are the same, then make end the 'end of day' value (start is at 00:00:00)
if (fullDayEvent && startDate.format("x") === endDate.format("x")) {
endDate = endDate.endOf("day");
Expand Down

0 comments on commit 4d8fb8c

Please sign in to comment.