Merge pull request #57345 from nextcloud/backport/57186/stable31

Altahrim · web-flow · commit bda8fa358d8c · 2026-01-08T13:58:38.000+01:00
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -34,7 +34,7 @@ protected function parseParams($params) {
 			throw new \Exception('Bucket has to be configured.');
 		}
 
-		if (isset($params['multibucket']) && $params['multibucket'] === true && isset($params['perBucket'][$params['bucket']])) {
+		if (isset($params['perBucket'][$params['bucket']])) {
 			$params = array_merge($params, $params['perBucket'][$params['bucket']]);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected function parseParams($params) {`
`34`	`34`	`throw new \Exception('Bucket has to be configured.');`
`35`	`35`	`}`
`36`	`36`
`37`		`- if (isset($params['multibucket']) && $params['multibucket'] === true && isset($params['perBucket'][$params['bucket']])) {`
	`37`	`+ if (isset($params['perBucket'][$params['bucket']])) {`
`38`	`38`	`$params = array_merge($params, $params['perBucket'][$params['bucket']]);`
`39`	`39`	`}`
`40`	`40`