From a16dfc7c41f75cea008dd980955c59859dad33c0 Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Sun, 9 Apr 2017 00:23:35 +0200 Subject: [PATCH] cardquery: query limit can be used independently of any query filter --- inc/caldav-REPORT-cardquery.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/caldav-REPORT-cardquery.php b/inc/caldav-REPORT-cardquery.php index 5f54494a..b629cecf 100644 --- a/inc/caldav-REPORT-cardquery.php +++ b/inc/caldav-REPORT-cardquery.php @@ -51,7 +51,6 @@ if ( count($qry_filters) == 0 ) { $qry_filters = false; } -$qry_limit = -1; // everything $qry_filters_combination='OR'; if ( is_array($qry_filters) ) { $filters_parent = $xmltree->GetPath('/urn:ietf:params:xml:ns:carddav:addressbook-query/urn:ietf:params:xml:ns:carddav:filter'); @@ -60,11 +59,12 @@ if ( is_array($qry_filters) ) { if ( $filters_parent->GetAttribute("test") == 'allof' ) { $qry_filters_combination='AND'; } +} - $limits = $xmltree->GetPath('/urn:ietf:params:xml:ns:carddav:addressbook-query/urn:ietf:params:xml:ns:carddav:limit/urn:ietf:params:xml:ns:carddav:nresults'); - if ( count($limits) == 1) { - $qry_limit = intval($limits[0]->GetContent()); - } +$qry_limit = -1; // everything +$limits = $xmltree->GetPath('/urn:ietf:params:xml:ns:carddav:addressbook-query/urn:ietf:params:xml:ns:carddav:limit/urn:ietf:params:xml:ns:carddav:nresults'); +if ( count($limits) == 1) { + $qry_limit = intval($limits[0]->GetContent()); } /**