Fixes Issue 49

Author: evert

ChangeLog

@@ -1,6 +1,7 @@
 1.2.0beta3 (2010-??-??)
 	* Fixed: Custom properties were not propertly sent back for allprops
 	  requests.
+	* Fixed: Issue 49, incorrect parsing of PROPPATCH, affecting Office 2007.
 
 1.2.0beta2 (2010-05-04)
 	* Fixed: Issue 46: Fatal error for some non-existant nodes.

lib/Sabre/DAV/Server.php

@@ -1681,21 +1681,16 @@ public function parsePropPatchRequest($body) {
 
             $innerProperties = Sabre_DAV_XMLUtil::parseProperties($child, $this->propertyMap);
 
-            // There should be exactly one
-            if (count($innerProperties)!==1) 
-                throw new Sabre_DAV_Exception_BadRequest('Only one {DAV:}prop may appear in any ' . $operation);
+            foreach($innerProperties as $propertyName=>$propertyValue) {
 
-            reset($innerProperties);
+                if ($operation==='{DAV:}remove') {
+                    $propertyValue = null;
+                }
 
-            $propertyName = key($innerProperties);
-            $propertyValue = current($innerProperties);
+                $newProperties[$propertyName] = $propertyValue;
 
-            if ($operation==='{DAV:}remove') {
-                $propertyValue = null;
             }
 
-            $newProperties[$propertyName] = $propertyValue;
-
         }
 
         return $newProperties;