mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19309 from nextcloud/backport/19219/stable17 

[stable17] Fix display of DTEND for multi-day all-day event
This commit is contained in:
Roeland Jago Douma 2020-02-05 22:21:58 +01:00 committed by GitHub
parent 3ddfdd30ba 7ce1b5083e
commit 52b5cfa8e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View File

@ -419,6 +419,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']);