From 0e0a07eb306e9a2bd8320bc1d594a3d636f3549a Mon Sep 17 00:00:00 2001
From: Jamie McClymont <jamiemcclymont@catalyst.net.nz>
Date: Tue, 13 Nov 2018 11:35:04 +1300
Subject: [PATCH] Fix returning dead properties in an allprop PROPFIND

dead_properties is an assoc.array from name to value, but it was being merged
with simple arrays of property names.

This means that tests 0824 and 0828 now actually return the dead properties, so
I've updated those result files.

Signed-off-by: Jamie McClymont <jamiemcclymont@catalyst.net.nz>
---
 inc/DAVResource.php                                 |  2 +-
 .../regression-suite/0824-Spec-PROPFIND-5.result    | 13 ++++++++++++-
 .../regression-suite/0828-Spec-PROPFIND-5.result    | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

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 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:" xmlns:A="http://apple.com/ns/ical/" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:D="urn:org:davical">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
    <prop>
+    <A:calendar-color>#0252D4FF</A:calendar-color>
+    <A:calendar-order>1</A:calendar-order>
+    <C:schedule-default-calendar-URL>
+     <href>/caldav.php/user1/home/</href>
+    </C:schedule-default-calendar-URL>
+    <D:outer>
+     <D:middle>
+      <D:inner>inside</D:inner>
+      <D:inner>inside2</D:inner>
+     </D:middle>
+    </D:outer>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <resourcetype>
      <collection/>
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 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<multistatus xmlns="DAV:" xmlns:A="http://apple.com/ns/ical/" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:D="urn:org:davical">
  <response>
   <href>/caldav.php/user1/home/</href>
   <propstat>
    <prop>
+    <A:calendar-color>#0252D4FF</A:calendar-color>
+    <A:calendar-order>1</A:calendar-order>
+    <C:schedule-default-calendar-URL>
+     <href>/caldav.php/user1/home/</href>
+    </C:schedule-default-calendar-URL>
+    <D:outer>
+     <D:middle>
+      <D:inner>inside</D:inner>
+      <D:inner>inside2</D:inner>
+     </D:middle>
+    </D:outer>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <resourcetype>
      <collection/>