From 2192ea6fdf21a00ccf44d626a01b756d194d6cbe Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 30 Oct 2018 12:12:07 +0100
Subject: update html_to_markdown, smarty and sabredav libs via composer

---
 vendor/sabre/dav/lib/DAV/Server.php | 7 ++++---
 vendor/sabre/dav/lib/DAV/Tree.php   | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'vendor/sabre/dav/lib/DAV')

diff --git a/vendor/sabre/dav/lib/DAV/Server.php b/vendor/sabre/dav/lib/DAV/Server.php
index 6805ec0b0..f7fcf3057 100644
--- a/vendor/sabre/dav/lib/DAV/Server.php
+++ b/vendor/sabre/dav/lib/DAV/Server.php
@@ -893,15 +893,16 @@ class Server extends EventEmitter implements LoggerAwareInterface {
             $newDepth--;
         }
 
+        $propertyNames = $propFind->getRequestedProperties();
+        $propFindType = !empty($propertyNames) ? PropFind::NORMAL : PropFind::ALLPROPS;
+
         foreach ($this->tree->getChildren($path) as $childNode) {
-            $subPropFind = clone $propFind;
-            $subPropFind->setDepth($newDepth);
             if ($path !== '') {
                 $subPath = $path . '/' . $childNode->getName();
             } else {
                 $subPath = $childNode->getName();
             }
-            $subPropFind->setPath($subPath);
+            $subPropFind = new PropFind($subPath, $propertyNames, $newDepth, $propFindType);
 
             yield [
                 $subPropFind,
diff --git a/vendor/sabre/dav/lib/DAV/Tree.php b/vendor/sabre/dav/lib/DAV/Tree.php
index 5d2792503..7c04f0915 100644
--- a/vendor/sabre/dav/lib/DAV/Tree.php
+++ b/vendor/sabre/dav/lib/DAV/Tree.php
@@ -298,7 +298,9 @@ class Tree {
      */
     protected function copyNode(INode $source, ICollection $destinationParent, $destinationName = null) {
 
-        if (!$destinationName) $destinationName = $source->getName();
+        if ((string)$destinationName === '') {
+            $destinationName = $source->getName();
+        }
 
         if ($source instanceof IFile) {
 
-- 
cgit v1.2.3