[Pkg-owncloud-commits] [php-sabredav] 73/163: Workaround for a hhvm problem. Also makes sense in vanilla php.

[David Prévot]

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

taffit pushed a commit to annotated tag upstream/2.0.0_beta1
in repository php-sabredav.

commit 3cc8734c36a4ff6fdd3317c6440b7a771c14523d
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Apr 14 23:02:12 2014 -0400

    Workaround for a hhvm problem. Also makes sense in vanilla php.
---
 lib/Sabre/CardDAV/AddressBookQueryParser.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Sabre/CardDAV/AddressBookQueryParser.php b/lib/Sabre/CardDAV/AddressBookQueryParser.php
index 3277d98..21d652d 100644
--- a/lib/Sabre/CardDAV/AddressBookQueryParser.php
+++ b/lib/Sabre/CardDAV/AddressBookQueryParser.php
@@ -113,12 +113,14 @@ class AddressBookQueryParser {
 
         $propFilters = array();
 
-        $propFilterNodes = $this->xpath->query('card:prop-filter', $filter);
-        for($ii=0; $ii < $propFilterNodes->length; $ii++) {
+        if (!is_null($filter)) {
+            $propFilterNodes = $this->xpath->query('card:prop-filter', $filter);
+            for($ii=0; $ii < $propFilterNodes->length; $ii++) {
 
-            $propFilters[] = $this->parsePropFilterNode($propFilterNodes->item($ii));
+                $propFilters[] = $this->parsePropFilterNode($propFilterNodes->item($ii));
 
 
+            }
         }
 
         $this->filters = $propFilters;

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