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
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-11-04 23:46:59 +0300
committerGitHub <noreply@github.com>2016-11-04 23:46:59 +0300
commita9547a2fd7c5b51f86e1d4c11958d074ad3d698c (patch)
treeece5d51ce3fa752fe20e078ddbacfa958382cfa8
parentf42d5b6e56d9f6fcab2074b60a4a3f4fe753420b (diff)
parentb72e5a2e4ed0ac281185d0436cdcafbe80c7f6e7 (diff)
Merge pull request #2015 from nextcloud/swift-bucket
allow using 'bucket' to set the swift container
-rw-r--r--lib/private/Files/ObjectStore/Swift.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Files/ObjectStore/Swift.php b/lib/private/Files/ObjectStore/Swift.php
index dbb8dde32ab..2ccaad27e88 100644
--- a/lib/private/Files/ObjectStore/Swift.php
+++ b/lib/private/Files/ObjectStore/Swift.php
@@ -30,6 +30,7 @@ use OpenCloud\OpenStack;
use OpenCloud\Rackspace;
class Swift implements IObjectStore {
+
/**
* @var \OpenCloud\OpenStack
*/
@@ -51,6 +52,9 @@ class Swift implements IObjectStore {
private $container;
public function __construct($params) {
+ if (isset($params['bucket'])) {
+ $params['container'] = $params['bucket'];
+ }
if (!isset($params['container'])) {
$params['container'] = 'owncloud';
}