aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Berendt <berendt@b1-systems.de>2013-07-03 18:56:51 +0200
committerChristian Berendt <berendt@b1-systems.de>2013-07-03 18:56:51 +0200
commitb3d6517c620723d15e0d4bff36cb3f7a6c871bb5 (patch)
tree0227e4814e11e2e9b1258a16ca540e9c1f2427e9
parent37254744b5b1d0f5761837dee1e33ad63dcff101 (diff)
downloadnextcloud-server-b3d6517c620723d15e0d4bff36cb3f7a6c871bb5.tar.gz
nextcloud-server-b3d6517c620723d15e0d4bff36cb3f7a6c871bb5.zip
use us-west-1 as default region for Amazon S3
-rw-r--r--apps/files_external/lib/amazons3.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 7b593b5e263..9b926ee47cc 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -70,11 +70,14 @@ class AmazonS3 extends \OC\Files\Storage\Common {
'base_url' => $base_url
));
} else {
+ if ( ! isset($params['region'])) {
+ $params['region'] = 'us-west-1';
+ }
$this->connection = S3Client::factory(array(
'key' => $params['key'],
'secret' => $params['secret'],
'scheme' => $scheme,
- 'region' => $region
+ 'region' => $params'[region']
));
}