Merge pull request #30771 from nextcloud/fix/proppatch-convert-complex-properties

come-nc · web-flow · commit 9b5245facf01 · 2022-01-20T18:31:32.000+01:00
Convert properties value to string before passing them to database
diff --git a/apps/dav/lib/DAV/CustomPropertiesBackend.php b/apps/dav/lib/DAV/CustomPropertiesBackend.php
@@ -303,6 +303,11 @@ private function updateProperties(string $path, array $properties) {
 					);
 				}
 			} else {
+				if ($propertyValue instanceOf \Sabre\DAV\Xml\Property\Complex) {
+					$propertyValue = $propertyValue->getXml();
+				} elseif (!is_string($propertyValue)) {
+					$propertyValue = (string)$propertyValue;
+				}
 				if (!array_key_exists($propertyName, $existing)) {
 					$this->connection->executeUpdate($insertStatement,
 						[

Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,11 @@ private function updateProperties(string $path, array $properties) {`
`303`	`303`	`);`
`304`	`304`	`}`
`305`	`305`	`} else {`
	`306`	`+ if ($propertyValue instanceOf \Sabre\DAV\Xml\Property\Complex) {`
	`307`	`+ $propertyValue = $propertyValue->getXml();`
	`308`	`+ } elseif (!is_string($propertyValue)) {`
	`309`	`+ $propertyValue = (string)$propertyValue;`
	`310`	`+ }`
`306`	`311`	`if (!array_key_exists($propertyName, $existing)) {`
`307`	`312`	`$this->connection->executeUpdate($insertStatement,`
`308`	`313`	`[`