diff --git a/inc/DAVResource.php b/inc/DAVResource.php index dcb45078..c2bb783f 100644 --- a/inc/DAVResource.php +++ b/inc/DAVResource.php @@ -1932,7 +1932,7 @@ EOQRY; case 'urn:ietf:params:xml:ns:carddav:supported-address-data': if ( ! $this->_is_collection || !$this->_is_addressbook ) return false; - $address_data = $reply->NewXMLElement( 'address-data', false, + $address_data = $reply->NewXMLElement( 'address-data-type', false, array( 'content-type' => 'text/vcard', 'version' => '3.0'), 'urn:ietf:params:xml:ns:carddav'); $reply->NSElement($prop, $tag, $address_data ); break; diff --git a/testing/tests/regression-suite/2801-iPhone-shared-addresses.result b/testing/tests/regression-suite/2801-iPhone-shared-addresses.result index be6afe76..e43ceb50 100644 --- a/testing/tests/regression-suite/2801-iPhone-shared-addresses.result +++ b/testing/tests/regression-suite/2801-iPhone-shared-addresses.result @@ -3,8 +3,8 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT Content-Location: /caldav.php/user1/addresses/ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "43765875e20eef2d841725645b2f3c95" -Content-Length: 1129 +ETag: "f73a50af58b7d84d6f3546091e757d47" +Content-Length: 1134 Content-Type: text/xml; charset="utf-8" @@ -40,7 +40,7 @@ Content-Type: text/xml; charset="utf-8" 6550000 - + HTTP/1.1 200 OK diff --git a/testing/tests/regression-suite/2802-correct-shared-addresses.result b/testing/tests/regression-suite/2802-correct-shared-addresses.result index 15aaaaf8..fa75c2d6 100644 --- a/testing/tests/regression-suite/2802-correct-shared-addresses.result +++ b/testing/tests/regression-suite/2802-correct-shared-addresses.result @@ -3,8 +3,8 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT Content-Location: /caldav.php/user1/addresses/ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy -ETag: "3f9506c10fe5b434f966d4c82f026c40" -Content-Length: 1129 +ETag: "98016787585c5b1e8136e5f58fba5b7f" +Content-Length: 1134 Content-Type: text/xml; charset="utf-8" @@ -40,7 +40,7 @@ Content-Type: text/xml; charset="utf-8" 6550000 - + HTTP/1.1 200 OK