Skip to content
Permalink
Browse files

Merge pull request #213 from nextcloud/backport/186/stable15

[stable15] Try to support 7.3 for DAV
  • Loading branch information...
MorrisJobke committed Feb 19, 2019
2 parents 4c0ce64 + 34e81bd commit 88f57274c0fa29e05a08351944915b0772a2fc2a
@@ -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;
@@ -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();
@@ -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;
@@ -511,7 +511,7 @@ function xmlSerialize(Xml\Writer $writer) {
switch ($property->name) {
case 'VERSION':
continue;
break;
case 'XML':
$value = $property->getParts();
@@ -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) {

0 comments on commit 88f5727

Please sign in to comment.
You can’t perform that action at this time.