Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable15] Try to support 7.3 for DAV #213

Merged
merged 1 commit into from
Feb 19, 2019
Merged

[stable15] Try to support 7.3 for DAV #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion sabre/dav/lib/CalDAV/ICSExportPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,9 @@ function mergeObjects(array $properties, array $inputObjects) {
// VTIMEZONE is special, because we need to filter out the duplicates
case 'VTIMEZONE' :
// Naively just checking tzid.
if (in_array((string)$child->TZID, $collectedTimezones)) continue;
if (in_array((string)$child->TZID, $collectedTimezones)) {
break;
}

$timezones[] = clone $child;
$collectedTimezones[] = $child->TZID;
Expand Down
4 changes: 2 additions & 2 deletions sabre/dav/lib/DAV/CorePlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ function httpPropFind(RequestInterface $request, ResponseInterface $response) {
try {
$propFindXml = $this->server->xml->expect('{DAV:}propfind', $requestBody);
} catch (ParseException $e) {
throw new BadRequest($e->getMessage(), null, $e);
throw new BadRequest($e->getMessage(), 0, $e);
}
} else {
$propFindXml = new Xml\Request\PropFind();
Expand Down Expand Up @@ -378,7 +378,7 @@ function httpPropPatch(RequestInterface $request, ResponseInterface $response) {
try {
$propPatch = $this->server->xml->expect('{DAV:}propertyupdate', $request->getBody());
} catch (ParseException $e) {
throw new BadRequest($e->getMessage(), null, $e);
throw new BadRequest($e->getMessage(), 0, $e);
}
$newProperties = $propPatch->properties;

Expand Down
2 changes: 1 addition & 1 deletion sabre/vobject/lib/Component/VCard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ function xmlSerialize(Xml\Writer $writer) {
switch ($property->name) {

case 'VERSION':
continue;
break;

case 'XML':
$value = $property->getParts();
Expand Down
2 changes: 1 addition & 1 deletion sabre/vobject/lib/FreeBusyGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ protected function calculateBusy(FreeBusyData $fbData, array $objects) {
// instance. We are skipping this event from the output
// entirely.
unset($this->objects[$key]);
continue;
break;
}

if ($this->start) {
Expand Down