diff --git a/inc/DAVResource.php b/inc/DAVResource.php index 4b34cee1..65311ebf 100644 --- a/inc/DAVResource.php +++ b/inc/DAVResource.php @@ -1534,7 +1534,7 @@ EOQRY; */ function DAV_AllProperties() { if ( !isset($this->dead_properties) ) $this->FetchDeadProperties(); - $allprop = array_merge( (isset($this->dead_properties)?$this->dead_properties:array()), + $allprop = array_merge( (isset($this->dead_properties)?array_keys($this->dead_properties):array()), (isset($include_properties)?$include_properties:array()), array( 'DAV::getcontenttype', 'DAV::resourcetype', 'DAV::getcontentlength', 'DAV::displayname', 'DAV::getlastmodified', diff --git a/testing/tests/regression-suite/0824-Spec-PROPFIND-5.result b/testing/tests/regression-suite/0824-Spec-PROPFIND-5.result index 0cd11d44..05d94318 100644 --- a/testing/tests/regression-suite/0824-Spec-PROPFIND-5.result +++ b/testing/tests/regression-suite/0824-Spec-PROPFIND-5.result @@ -1,9 +1,20 @@ - + /caldav.php/user1/home/ + #0252D4FF + 1 + + /caldav.php/user1/home/ + + + + inside + inside2 + + httpd/unix-directory diff --git a/testing/tests/regression-suite/0828-Spec-PROPFIND-5.result b/testing/tests/regression-suite/0828-Spec-PROPFIND-5.result index 0cd11d44..05d94318 100644 --- a/testing/tests/regression-suite/0828-Spec-PROPFIND-5.result +++ b/testing/tests/regression-suite/0828-Spec-PROPFIND-5.result @@ -1,9 +1,20 @@ - + /caldav.php/user1/home/ + #0252D4FF + 1 + + /caldav.php/user1/home/ + + + + inside + inside2 + + httpd/unix-directory