diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-02-05 22:54:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-05 22:54:02 +0300 |
| commit | bfb1273a2e26f527ed2b75df5ae7bb3844015b13 (patch) | |
| tree | b9d4b02577e4a5e68ae309021f79fa1eec0d4af8 /apps/dav | |
| parent | bef906b518de70393c70c698a8a4dcf478951469 (diff) | |
| parent | 165fc172b11adbd7b3c4537745f0ab08fdee7410 (diff) | |
Merge pull request #19219 from nextcloud/bugfix/19135/wrong_dtend_invitation_mail
Fix display of DTEND for multi-day all-day event
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/CalDAV/Schedule/IMipPlugin.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php index ef4255b22c0..982c579d3bb 100644 --- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php +++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php @@ -440,6 +440,10 @@ class IMipPlugin extends SabreIMipPlugin { return $l10n->l('date', $dtstartDt, ['width' => 'medium']); } + // DTEND is exclusive, so if the ics data says 2020-01-01 to 2020-01-05, + // the email should show 2020-01-01 to 2020-01-04. + $dtendDt->modify('-1 day'); + //event that spans over multiple days $localeStart = $l10n->l('date', $dtstartDt, ['width' => 'medium']); $localeEnd = $l10n->l('date', $dtendDt, ['width' => 'medium']); |