nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-11-01 09:49:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-344-address-data-type' into 'master'

Browse Source 
fix: use address-data-type in CARDDAV:supported-address-data

See merge request davical-project/davical!153
This commit is contained in:
Armin Fuerst 2026-10-20 17:25:15 +00:00
commit 532a9362fb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/DAVResource.php
View File

@ -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;

6
testing/tests/regression-suite/2801-iPhone-shared-addresses.result
View File

@ -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"
<?xml version="1.0" encoding="utf-8" ?>
@ -40,7 +40,7 @@ Content-Type: text/xml; charset="utf-8"
</current-user-principal>
<C:max-resource-size>6550000</C:max-resource-size>
<C:supported-address-data>
<C:address-data content-type="text/vcard" version="3.0"/>
<C:address-data-type content-type="text/vcard" version="3.0"/>
</C:supported-address-data>
</prop>
<status>HTTP/1.1 200 OK</status>

6
testing/tests/regression-suite/2802-correct-shared-addresses.result
View File

@ -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"
<?xml version="1.0" encoding="utf-8" ?>
@ -40,7 +40,7 @@ Content-Type: text/xml; charset="utf-8"
</current-user-principal>
<C:max-resource-size>6550000</C:max-resource-size>
<C:supported-address-data>
<C:address-data content-type="text/vcard" version="3.0"/>
<C:address-data-type content-type="text/vcard" version="3.0"/>
</C:supported-address-data>
</prop>
<status>HTTP/1.1 200 OK</status>