Merge pull request #1 from Skyr/master

implemented change for Radicale server: Ignore elements of resourcetype collection
carlos22 · Aug 9, 2015 · c018faf · c018faf
2 parents 6c7bbad + 09cc5a8
commit c018faf
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/carddav.php b/carddav.php
@@ -552,7 +552,8 @@ private function simplify($response, $include_vcards = true)
 
         if (!empty($xml->response)) {
             foreach ($xml->response as $response) {
-                if (preg_match('/vcard/', $response->propstat->prop->getcontenttype) || preg_match('/vcf/', $response->href)) {
+              if ((preg_match('/vcard/', $response->propstat->prop->getcontenttype) || preg_match('/vcf/', $response->href)) &&
+                  !$response->propstat->prop->resourcetype->collection) {
                     $id = basename($response->href);
                     $id = str_replace($this->url_vcard_extension, null, $id);