Changed AWS S3 adapter to not override default S3 config if not set

dmyers · Sep 5, 2014 · c239b7d · c239b7d
1 parent b967b78
commit c239b7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/Dmyers/Storage/Adapter/AmazonS3.php b/src/Dmyers/Storage/Adapter/AmazonS3.php
@@ -12,6 +12,8 @@ public function __construct()
 	{
 		$key = $this->config('key');
 
+		$region = $this->config('region');
+
 		if (empty($key)) {
 			throw new \RuntimeException('AmazonS3 key config required.');
 		}
@@ -21,12 +23,6 @@ public function __construct()
 		if (empty($secret)) {
 			throw new \RuntimeException('AmazonS3 secret config required.');
 		}
-
-		$region = $this->config('region');
-
-		if (empty($region)) {
-			throw new \RuntimeException('AmazonS3 region config required.');
-		}
 
 		$bucket = $this->config('bucket');
 

diff --git a/src/config/config.php b/src/config/config.php
@@ -25,7 +25,7 @@
 	'amazons3' => array(
 		'key'    => '',
 		'secret' => '',
-		'region' => 'us-east-1',
+		'region' => '',
 		'bucket' => '',
 		'acl'    => 'public-read',
 	),