Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-02-06 00:22:12 +0300
committerGitHub <noreply@github.com>2020-02-06 00:22:12 +0300
commitea6e4cb033c5234fd8b9b633810fcc62f3ee3606 (patch)
tree5e89595744a4886e455bdd46f634b1b90341c709
parent9fd015353ce244fd7875bbccf3dca87a1a09b0ec (diff)
parentbefa7f49136625916e54473e1d4e91b7499d906e (diff)
Merge pull request #19308 from nextcloud/backport/19219/stable18
[stable18] Fix display of DTEND for multi-day all-day event
-rw-r--r--apps/dav/lib/CalDAV/Schedule/IMipPlugin.php4
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']);