From: Georg Ehrke <developer@georgehrke.com>
Date: Thu, 30 Jan 2020 14:02:16 +0000 (+0100)
Subject: Fix display of DTEND for multi-day all-day event
X-Git-Tag: v19.0.0beta1~317^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F19219%2Fhead;p=nextcloud-server.git

Fix display of DTEND for multi-day all-day event

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
---

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']);