Skip to content

Commit

Permalink
Merge pull request #196 from nextcloud/backport/191/stable15
Browse files Browse the repository at this point in the history
[stable15] Broker: add timezone to CANCEL messages
  • Loading branch information
rullzer committed Jan 10, 2019
2 parents 21f7b11 + 922496e commit 21b7908
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions patches.txt
Expand Up @@ -6,6 +6,7 @@ Patches:
- SabreDAV: Make sure that files that are children of directories, are reported as files https://github.com/fruux/sabre-dav/issues/982
- SabreDAV: Don't open the file on HEAD requests https://github.com/sabre-io/dav/pull/1058
- SabreDAV: Properly parse carddav address-data https://github.com/sabre-io/dav/pull/1025
- SabreVObject: Broker: add timezone to CANCEL messages https://github.com/sabre-io/vobject/pull/412
- SabreXML: Fix invalid PHP docs https://github.com/fruux/sabre-xml/pull/128
- SabreXML: Prevent infinite loops for empty props element https://github.com/fruux/sabre-xml/pull/132
- ZipStreamer: Fix zip generation for 7zip https://github.com/McNetic/PHPZipStreamer/pull/39
5 changes: 5 additions & 0 deletions sabre/vobject/lib/ITip/Broker.php
Expand Up @@ -523,6 +523,11 @@ protected function parseEventForOrganizer(VCalendar $calendar, array $eventInfo,
// Creating the new iCalendar body.
$icalMsg = new VCalendar();
$icalMsg->METHOD = $message->method;

foreach ($calendar->select('VTIMEZONE') as $timezone) {
$icalMsg->add(clone $timezone);
}

$event = $icalMsg->add('VEVENT', [
'UID' => $message->uid,
'SEQUENCE' => $message->sequence,
Expand Down

0 comments on commit 21b7908

Please sign in to comment.