Merge pull request #1003 from nextcloud/backport/994/stable19

[stable19] only return rich workspace when depth is 1 or greater
nextcloud · Sep 10, 2020 · a9f008f · a9f008f
2 parents 6cb27af + 88890d3
commit a9f008f
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/lib/DAV/WorkspacePlugin.php b/lib/DAV/WorkspacePlugin.php
@@ -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 '';
+			});
+		}
 	}
 
 }