diff --git a/inc/CalDAVRequest.php b/inc/CalDAVRequest.php
index e0194a25..f4f9083f 100644
--- a/inc/CalDAVRequest.php
+++ b/inc/CalDAVRequest.php
@@ -918,9 +918,9 @@ EOSQL;
$reports = array();
foreach( $this->supported_reports AS $k => $v ) {
dbg_error_log( 'caldav', 'Adding supported report "%s" which is "%s".', $k, $v );
- $report = new XMLElement('supported-report');
+ $report = new XMLElement('report');
$reply->NSElement($report, $k );
- $reports[] = $report;
+ $reports[] = new XMLElement('supported-report', $report );
}
return $reports;
}
diff --git a/inc/DAVResource.php b/inc/DAVResource.php
index 197b0b88..f2765f31 100644
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@@ -651,9 +651,9 @@ EOQRY;
$reports = array();
foreach( $this->supported_reports AS $k => $v ) {
dbg_error_log( 'DAVResource', ':BuildSupportedReports: Adding supported report "%s" which is "%s".', $k, $v );
- $report = new XMLElement('supported-report');
+ $report = new XMLElement('report');
$reply->NSElement($report, $k );
- $reports[] = $report;
+ $reports[] = new XMLElement('supported-report', $report );
}
return $reports;
}
diff --git a/testing/tests/regression-suite/531-iCal4-PROPFIND.result b/testing/tests/regression-suite/531-iCal4-PROPFIND.result
index 38c40ce0..d076221f 100644
--- a/testing/tests/regression-suite/531-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/531-iCal4-PROPFIND.result
@@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "caffdb62355a041b215bfca256c7e14f"
-Content-Length: 1439
+ETag: "c3a398e212672c218ea97a56017b1166"
+Content-Length: 1535
Content-Type: text/xml; charset="utf-8"
@@ -36,13 +36,19 @@ Content-Type: text/xml; charset="utf-8"
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/testing/tests/regression-suite/916-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/916-PROPFIND-supported-stuff.result
index 1ff0950d..7f7c0684 100644
--- a/testing/tests/regression-suite/916-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/916-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "abfbbcc5572e1a2e160eac87352f15ca"
-Content-Length: 1061
+ETag: "7bb4b23aad9dc0617c966e0c8fc04bc3"
+Content-Length: 1157
Content-Type: text/xml; charset="utf-8"
@@ -22,13 +22,19 @@ Content-Type: text/xml; charset="utf-8"
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/testing/tests/regression-suite/917-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/917-PROPFIND-supported-stuff.result
index 2183850c..14d03ca5 100644
--- a/testing/tests/regression-suite/917-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/917-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "25bc804e7cd5c233d7ac7b3a3357109b"
-Content-Length: 1358
+ETag: "3633f78583024cb6699239efbba3ec94"
+Content-Length: 1454
Content-Type: text/xml; charset="utf-8"
@@ -33,13 +33,19 @@ Content-Type: text/xml; charset="utf-8"
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result
index 6e208ced..6ed36546 100644
--- a/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/918-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "d0106b2b3cddd962bafded74285d643d"
-Content-Length: 1658
+ETag: "abd3df8ba7b00d965c7a77b891cb4e16"
+Content-Length: 1850
Content-Type: text/xml; charset="utf-8"
@@ -30,22 +30,34 @@ Content-Type: text/xml; charset="utf-8"
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result
index 52d3b342..f988a767 100644
--- a/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/919-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "fa162cca33c127c460b2ebf292c0e058"
-Content-Length: 1443
+ETag: "134b9fb41e6c5b7354bdd0389bf219f2"
+Content-Length: 1539
Content-Type: text/xml; charset="utf-8"
@@ -32,13 +32,19 @@ Content-Type: text/xml; charset="utf-8"
-
+
+
+
-
+
+
+
-
+
+
+
diff --git a/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result
index 3d613876..57e08172 100644
--- a/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/920-PROPFIND-supported-stuff.result
@@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "66819702cbea0476ec78e4b35254c3e5"
-Content-Length: 1446
+ETag: "945223598c3b28fe6cbf9c6e6b74da04"
+Content-Length: 1542
Content-Type: text/xml; charset="utf-8"
@@ -32,13 +32,19 @@ Content-Type: text/xml; charset="utf-8"
-
+
+
+
-
+
+
+
-
+
+
+