summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2020-01-30 15:02:16 +0100
committerBackportbot <backportbot-noreply@rullzer.com>2020-02-05 19:55:03 +0000
commitbefa7f49136625916e54473e1d4e91b7499d906e (patch)
tree140e157f66757857b8c8e76c395ee56b5561b798
parent6e876fad65cd6d0e2f3020723bccaa7fea0d210c (diff)
downloadnextcloud-server-befa7f49136625916e54473e1d4e91b7499d906e.tar.gz
nextcloud-server-befa7f49136625916e54473e1d4e91b7499d906e.zip
Fix display of DTEND for multi-day all-day event
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
-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']);