Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-03-06 15:38:23 +0300
committerGitHub <noreply@github.com>2018-03-06 15:38:23 +0300
commited8e4cc78544df8fd4564115946959c0163a3118 (patch)
tree9cfa12e2d268cb7d12a11e322a3c3d6fefba45e0 /apps
parent16fa18ab49a10ac3f562a25d6b5e86c5d8f4e2b2 (diff)
parent3036fb95ae94d94129d4628c4ed4907f2de9cc1a (diff)
Merge pull request #8667 from nextcloud/8158_13
[stable13] Use a more widely available method to test s3 settings
Diffstat (limited to 'apps')
-rw-r--r--apps/files_external/lib/Lib/Storage/AmazonS3.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index c8465997f65..cc9cdc08138 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -572,13 +572,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
public function test() {
- $test = $this->getConnection()->getBucketAcl(array(
- 'Bucket' => $this->bucket,
- ));
- if (isset($test) && !is_null($test->getPath('Owner/ID'))) {
- return true;
- }
- return false;
+ $this->getConnection()->headBucket([
+ 'Bucket' => $this->bucket
+ ]);
+ return true;
}
public function getId() {