[Pkg-owncloud-commits] [php-sabredav] 01/02: Properly concatenate $path, even if it's "0"

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 2.1
in repository php-sabredav.

commit 4b3e1c1ad211304130135d6c6fc14fcc1fbea196
Author: Vincent Petry <PVince81 at yahoo.fr>
Date:   Wed Jun 17 05:54:00 2015 -0400

    Properly concatenate $path, even if it's "0"
---
 ...8-Properly-concatenate-path-even-if-it-s-0.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/0008-Properly-concatenate-path-even-if-it-s-0.patch b/debian/patches/0008-Properly-concatenate-path-even-if-it-s-0.patch
new file mode 100644
index 0000000..1bc1f46
--- /dev/null
+++ b/debian/patches/0008-Properly-concatenate-path-even-if-it-s-0.patch
@@ -0,0 +1,21 @@
+From: Vincent Petry <PVince81 at yahoo.fr>
+Date: Wed, 17 Jun 2015 11:54:00 +0200
+Subject: Properly concatenate $path, even if it's "0"
+
+---
+ lib/DAV/Server.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/DAV/Server.php b/lib/DAV/Server.php
+index 5255ade..41265bc 100644
+--- a/lib/DAV/Server.php
++++ b/lib/DAV/Server.php
+@@ -878,7 +878,7 @@ class Server extends EventEmitter {
+         foreach($this->tree->getChildren($path) as $childNode) {
+             $subPropFind = clone $propFind;
+             $subPropFind->setDepth($newDepth);
+-            $subPath = $path? $path . '/' . $childNode->getName() : $childNode->getName();
++            $subPath = $path !== ''? $path . '/' . $childNode->getName() : $childNode->getName();
+             $subPropFind->setPath($subPath);
+ 
+             $propFindRequests[] = [
diff --git a/debian/patches/series b/debian/patches/series
index 9738c94..27deada 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-tfix-threshold.patch
 0006-tfix-selection.patch
 0007-Rename-naturalselection-as-naturalselection21.patch
+0008-Properly-concatenate-path-even-if-it-s-0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git