Sabre patch for recursive PROPFIND and "0" folders

owncloud-archive · Jun 17, 2015 · 6d8e2cb · 6d8e2cb
1 parent 54e62d2
commit 6d8e2cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/patches.txt b/patches.txt
@@ -3,3 +3,4 @@ Patches:
 - remove dompdf from phpdocx, because we already ship dompdf in the 3rdparty's root folder (see 3ae4904 and e1e3207)
 - some external entity patches from https://github.com/owncloud/3rdparty/pull/74 - they should get superseeded by updating the affected libraries.
 - Doctrine: fix postgres column escaping when using reserved keyword: https://github.com/doctrine/dbal/pull/627
+- Sabre: properly concatenate folders with name "0" in PROPFIND calls: https://github.com/fruux/sabre-dav/pull/677
diff --git a/sabre/dav/lib/DAV/Server.php b/sabre/dav/lib/DAV/Server.php
@@ -878,7 +878,11 @@ private function addPathNodesRecursively(&$propFindRequests, PropFind $propFind)
         foreach($this->tree->getChildren($path) as $childNode) {
             $subPropFind = clone $propFind;
             $subPropFind->setDepth($newDepth);
-            $subPath = $path? $path . '/' . $childNode->getName() : $childNode->getName();
+            if (isset($path[0])) {
+                $subPath = $path . '/' . $childNode->getName();
+            } else {
+                $subPath = $childNode->getName();
+            }
             $subPropFind->setPath($subPath);
 
             $propFindRequests[] = [