diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2020-07-03 10:22:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-03 10:22:53 +0200 |
| commit | 318d553dbdbcacbfe2d7e060142647e0ce412e69 (patch) | |
| tree | b8e3ce07c2125133579da7bf91620a2268233785 /lib/private/Files | |
| parent | 5e985c61dc61f21c9daa9a50a9ac5a1179e5ea3f (diff) | |
| parent | d3a4bc91f7bfe449779a4dd57d1f6995c703f5b2 (diff) | |
| download | nextcloud-server-318d553dbdbcacbfe2d7e060142647e0ce412e69.tar.gz nextcloud-server-318d553dbdbcacbfe2d7e060142647e0ce412e69.zip | |
Merge pull request #21662 from nextcloud/fix/s3-bucket-compat-static-call
Fix static method call for s3 bucket compat check
Diffstat (limited to 'lib/private/Files')
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index 16a48ee82a0..b96a11833cd 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -110,7 +110,7 @@ trait S3ConnectionTrait { } $this->connection = new S3Client($options); - if (!$this->connection->isBucketDnsCompatible($this->bucket)) { + if (!$this->connection::isBucketDnsCompatible($this->bucket)) { $logger = \OC::$server->getLogger(); $logger->debug('Bucket "' . $this->bucket . '" This bucket name is not dns compatible, it may contain invalid characters.', ['app' => 'objectstore']); @@ -120,7 +120,7 @@ trait S3ConnectionTrait { $logger = \OC::$server->getLogger(); try { $logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']); - if (!$this->connection->isBucketDnsCompatible($this->bucket)) { + if (!$this->connection::isBucketDnsCompatible($this->bucket)) { throw new \Exception("The bucket will not be created because the name is not dns compatible, please correct it: " . $this->bucket); } $this->connection->createBucket(['Bucket' => $this->bucket]); |