Merge branch '2014.11' into 2014.11-develop
[tine20] / tine20 / Tinebase / WebDav / Collection / AbstractContainerTree.php
index 722ebae..b653169 100644 (file)
@@ -245,8 +245,6 @@ abstract class Tinebase_WebDav_Collection_AbstractContainerTree extends \Sabre\D
             
                 break;
         }
-    
-        
     }
     
     /**
@@ -345,7 +343,7 @@ abstract class Tinebase_WebDav_Collection_AbstractContainerTree extends \Sabre\D
                 
                 foreach ($containers as $container) {
                     try {
-                        $children[] = $this->getChild($container);
+                        $children[] = $this->getChild($this->_useIdAsName ? $container->getId() : $container->name);
                     } catch (\Sabre\DAV\Exception\NotFound $sdavenf) {
                         // ignore containers not found
                     }