From b3c873d2bb0eb8f28599fe2234654067d88a9637 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Wed, 2 Nov 2011 10:15:32 +1300
Subject: [PATCH] Correct handling of empty CardDAV:address-data element in
 request.

---
 inc/caldav-REPORT-cardquery.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/caldav-REPORT-cardquery.php b/inc/caldav-REPORT-cardquery.php
index 968919fd..4115ecd4 100644
--- a/inc/caldav-REPORT-cardquery.php
+++ b/inc/caldav-REPORT-cardquery.php
@@ -7,7 +7,8 @@ function get_address_properties( $address_data_xml ) {
   global $address_data_properties;
   $expansion = $address_data_xml->GetElements();
   foreach( $expansion AS $k => $v ) {
-    $address_data_properties[strtoupper($v->GetAttribute('name'))] = true;
+    if ( $v instanceof XMLElement )
+      $address_data_properties[strtoupper($v->GetAttribute('name'))] = true;
   }
 }