[Pkg-owncloud-commits] [php-sabredav] 28/34: Fixes #659.

[David Prévot]

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

taffit pushed a commit to tag 3.0.0-beta1
in repository php-sabredav.

commit c8069665566de001f4633424d6fd28181b3507ed
Author: Evert Pot <me at evertpot.com>
Date:   Mon May 25 19:07:40 2015 -0400

    Fixes #659.
---
 lib/DAV/Server.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/DAV/Server.php b/lib/DAV/Server.php
index ea88719..ae91a42 100644
--- a/lib/DAV/Server.php
+++ b/lib/DAV/Server.php
@@ -1260,7 +1260,7 @@ class Server extends EventEmitter {
                     // Stripping any extra spaces
                     $ifMatchItem = trim($ifMatchItem, ' ');
 
-                    $etag = $node->getETag();
+                    $etag = $node instanceof IFile ? $node->getETag() : null;
                     if ($etag === $ifMatchItem) {
                         $haveMatch = true;
                     } else {
@@ -1300,7 +1300,7 @@ class Server extends EventEmitter {
 
                     // There might be multiple ETags
                     $ifNoneMatch = explode(',', $ifNoneMatch);
-                    $etag = $node->getETag();
+                    $etag = $node instanceof IFile ? $node->getETag() : null;
 
                     foreach ($ifNoneMatch as $ifNoneMatchItem) {
 

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