feat: don't gate perBucket object store configuration behind multibucket

icewind1991 · icewind1991 · commit afa23291d6c1 · 2026-01-05T16:09:25.000+01:00
a setup can have multiple bucket without having `multibucket` enabled trough things like per-groupfolder buckets

Signed-off-by: Robin Appelman &lt;robin@icewind.nl&gt;
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -39,7 +39,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
`@@ -39,7 +39,7 @@ protected function parseParams($params) {`
`39`	`39`	`throw new \Exception('Bucket has to be configured.');`
`40`	`40`	`}`
`41`	`41`
`42`		`- if (isset($params['multibucket']) && $params['multibucket'] === true && isset($params['perBucket'][$params['bucket']])) {`
	`42`	`+ if (isset($params['perBucket'][$params['bucket']])) {`
`43`	`43`	`$params = array_merge($params, $params['perBucket'][$params['bucket']]);`
`44`	`44`	`}`
`45`	`45`