From b3d6517c620723d15e0d4bff36cb3f7a6c871bb5 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Wed, 3 Jul 2013 18:56:51 +0200 Subject: use us-west-1 as default region for Amazon S3 --- apps/files_external/lib/amazons3.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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'] )); } -- cgit v1.2.3