Merge branch '1.7' into 1.8

Conflicts: lib/Sabre/DAV/Client.php
gobb · May 6, 2013 · cac0ad8 · cac0ad8
2 parents 4e6612f + a447028
commit cac0ad8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -50,6 +50,7 @@
 	* Fixed: Text was incorrectly escaped in the Href and HrefList properties,
 	  disallowing urls with ampersands (&) in them.
 	* Added: deserializer for Sabre\DAVACL\Property\CurrentUserPrivilegeSet.
+	* Fixed: Issue 335: Client only deserializes properties with status 200.
 
 1.7.7-stable (2013-04-11)
 	* The zip release ships with sabre/vobject 2.0.7.

diff --git a/lib/Sabre/DAV/Client.php b/lib/Sabre/DAV/Client.php
@@ -548,7 +548,10 @@ public function parseMultiStatus($body) {
                 $status = $propStat->xpath('d:status');
                 list($httpVersion, $statusCode, $message) = explode(' ', (string)$status[0],3);
 
-                $properties[$statusCode] = XMLUtil::parseProperties(dom_import_simplexml($propStat), $this->propertyMap);
+                // Only using the propertymap for results with status 200.
+                $propertyMap = $statusCode==='200' ? $this->propertyMap : array();
+
+                $properties[$statusCode] = XMLUtil::parseProperties(dom_import_simplexml($propStat), $propertyMap);
 
             }