Skip to content

Commit

Permalink
do not return rich workspace when depth=0
Browse files Browse the repository at this point in the history
Signed-off-by: dassio <[email protected]>
  • Loading branch information
dassio committed Aug 31, 2020
1 parent 4cc0410 commit da600dc
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions lib/DAV/WorkspacePlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,24 +93,24 @@ public function propFind(PropFind $propFind, INode $node) {
if (!$workspaceAvailable || !$workspaceEnabled) {
return;
}

$propFind->handle(self::WORKSPACE_PROPERTY, function () use ($node) {
/** @var Folder[] $nodes */
$nodes = $this->rootFolder->getUserFolder($this->userId)->getById($node->getId());
if (count($nodes) > 0) {
/** @var File $file */
try {
$file = $this->workspaceService->getFile($nodes[0]);
if ($file instanceof File) {
return $file->getContent();
}
} catch (StorageNotAvailableException $e) {
if ($propFind->getDepth() > 0) {
$propFind->handle(self::WORKSPACE_PROPERTY, function () use ($node) {
/** @var Folder[] $nodes */
$nodes = $this->rootFolder->getUserFolder($this->userId)->getById($node->getId());
if (count($nodes) > 0) {
/** @var File $file */
try {
$file = $this->workspaceService->getFile($nodes[0]);
if ($file instanceof File) {
return $file->getContent();
}
} catch (StorageNotAvailableException $e) {
// If a storage is not available we can for the propfind response assume that there is no rich workspace present
}
}
}
return '';
});

return '';
});
}
}

}

0 comments on commit da600dc

Please sign in to comment.