[Pkg-owncloud-commits] [owncloud] 13/49: Fixed test function for S3
David Prévot
taffit at moszumanska.debian.org
Thu Dec 5 16:02:52 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit e372971f2b766f5563583a9693c2e2f75b9fd3a2
Author: Vincent Petry <pvince81 at owncloud.com>
Date: Mon Dec 2 18:32:32 2013 +0100
Fixed test function for S3
Fixes #5752
---
apps/files_external/lib/amazons3.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index b6d02ee..00baacd 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -507,8 +507,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
public function test() {
- $test = $this->s3->get_canonical_user_id();
- if (isset($test['id']) && $test['id'] != '') {
+ $test = $this->connection->getBucketAcl(array(
+ 'Bucket' => $this->bucket,
+ ));
+ if (isset($test) && !is_null($test->getPath('Owner/ID'))) {
return true;
}
return false;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list