Merge pull request #23207 from nextcloud/backport/23028/stable20

MorrisJobke · web-flow · commit 853b17b2a9e3 · 2020-10-06T09:09:34.000+02:00
[stable20] Fix array to string conversion on event search
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -1780,7 +1780,7 @@ public function searchPrincipalUri(string $principalUri,
 		foreach ($searchParameters as $property => $parameter) {
 			$parameterAnd = $calendarObjectIdQuery->expr()->andX();
 			$parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.name', $calendarObjectIdQuery->createNamedParameter($property, IQueryBuilder::PARAM_STR)));
-			$parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.parameter', $calendarObjectIdQuery->createNamedParameter($parameter, IQueryBuilder::PARAM_STR)));
+			$parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.parameter', $calendarObjectIdQuery->createNamedParameter($parameter, IQueryBuilder::PARAM_STR_ARRAY)));
 
 			$searchOr->add($parameterAnd);
 		}

Original file line number	Diff line number	Diff line change
`@@ -1780,7 +1780,7 @@ public function searchPrincipalUri(string $principalUri,`
`1780`	`1780`	`foreach ($searchParameters as $property => $parameter) {`
`1781`	`1781`	`$parameterAnd = $calendarObjectIdQuery->expr()->andX();`
`1782`	`1782`	`$parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.name', $calendarObjectIdQuery->createNamedParameter($property, IQueryBuilder::PARAM_STR)));`
`1783`		`- $parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.parameter', $calendarObjectIdQuery->createNamedParameter($parameter, IQueryBuilder::PARAM_STR)));`
	`1783`	`+ $parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.parameter', $calendarObjectIdQuery->createNamedParameter($parameter, IQueryBuilder::PARAM_STR_ARRAY)));`
`1784`	`1784`
`1785`	`1785`	`$searchOr->add($parameterAnd);`
`1786`	`1786`	`}`