Skip to content
Snippets Groups Projects

CalDAV: if timestamps ends with 'Z', consider it UTC

Merged Vincent Brillault requested to merge cern_vb_2_cern into cern
1 file
+ 4
1
Compare changes
  • Side-by-side
  • Inline
@@ -828,6 +828,9 @@ class BackendCalDAV extends BackendDiff {
if (isset($property['TZID'])) {
$tzid = $property->getDateTime()->getTimezone()->getName();
}
else if (((string)$property->getValue())[-1] == "Z") {
$tzid = 'UTC';
}
else {
$timezone = new DateTimeZone($tzid);
$message->starttime = $message->starttime - $timezone->getOffset($property->getDateTime());
@@ -839,7 +842,7 @@ class BackendCalDAV extends BackendDiff {
case "DTEND":
$message->endtime = $property->getDateTime()->getTimestamp();
if (!isset($property['TZID'])) {
if ((!isset($property['TZID'])) && (((string)$property->getValue())[-1] != "Z")) {
$timezone = new DateTimeZone($tzid);
$message->endtime = $message->endtime - $timezone->getOffset($property->getDateTime());
}
Loading