Merge pull request #57344 from nextcloud/backport/57186/stable30

tobiasKaminsky · web-flow · commit 20954f55157f · 2026-01-12T15:48:43.000+01:00
[stable30] feat: don't gate perBucket object store configuration behind multibucket
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -35,7 +35,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
`@@ -35,7 +35,7 @@ protected function parseParams($params) {`
`35`	`35`	`throw new \Exception('Bucket has to be configured.');`
`36`	`36`	`}`
`37`	`37`
`38`		`- if (isset($params['multibucket']) && $params['multibucket'] === true && isset($params['perBucket'][$params['bucket']])) {`
	`38`	`+ if (isset($params['perBucket'][$params['bucket']])) {`
`39`	`39`	`$params = array_merge($params, $params['perBucket'][$params['bucket']]);`
`40`	`40`	`}`
`41`	`41`