diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-05-24 15:03:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 15:03:22 +0200 |
| commit | 96e892770d0b37fab66f8b92c10866fadccf98c5 (patch) | |
| tree | 46777fd171758cb2b298a04af456579e18a99b22 /lib | |
| parent | 9c7503ea7e09aef1b9999803823ed61db6be9212 (diff) | |
| parent | 834db3af2c89480cd7dec7c2cc8df22279ae21a4 (diff) | |
| download | nextcloud-server-96e892770d0b37fab66f8b92c10866fadccf98c5.tar.gz nextcloud-server-96e892770d0b37fab66f8b92c10866fadccf98c5.zip | |
Merge pull request #15715 from nextcloud/s3-bucket-name
Allow other code to use the s3 client from object store
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index b2bb6d706e0..4cd25878ec5 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -65,6 +65,9 @@ trait S3ConnectionTrait { $this->params = $params; } + public function getBucket() { + return $this->bucket; + } /** * Returns the connection @@ -72,7 +75,7 @@ trait S3ConnectionTrait { * @return S3Client connected client * @throws \Exception if connection could not be made */ - protected function getConnection() { + public function getConnection() { if (!is_null($this->connection)) { return $this->connection; } |