Skip to content

Commit

Permalink
Merge pull request #15715 from nextcloud/s3-bucket-name
Browse files Browse the repository at this point in the history
Allow other code to use the s3 client from object store
  • Loading branch information
MorrisJobke authored May 24, 2019
2 parents 9c7503e + 834db3a commit 96e8927
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion lib/private/Files/ObjectStore/S3ConnectionTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,17 @@ protected function parseParams($params) {
$this->params = $params;
}

public function getBucket() {
return $this->bucket;
}

/**
* Returns the connection
*
* @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;
}
Expand Down

0 comments on commit 96e8927

Please sign in to comment.