Skip to content

Commit

Permalink
Merge pull request #192 from helios-ag/aws_flysystem
Browse files Browse the repository at this point in the history
fixed aws_s3_v3 configuration
  • Loading branch information
helios-ag committed Dec 4, 2015
2 parents 4c66502 + 0b9a990 commit e08ff91
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Configuration/ElFinderConfigurationReader.php
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,15 @@ private function configureFlysystem($opt, $adapter)
$filesystem = new Filesystem(new AwsS3v2($client, $opt['aws_s3_v2']['bucket_name'], $opt['aws_s3_v2']['optional_prefix']));
break;
case 'aws_s3_v3':
$client = S3Client::factory(array(
'key' => $opt['aws_s3_v3']['key'],
'secret' => $opt['aws_s3_v3']['secret'],
$client = new S3Client(array(
'credentials' => array(
'key' => $opt['aws_s3_v3']['key'],
'secret' => $opt['aws_s3_v3']['secret'],
),
'region' => $opt['aws_s3_v3']['region'],
'version' => $opt['aws_s3_v3']['version'],
));
$filesystem = new Filesystem(new AwsS3v3($client, $opt['aws_s3_v3']['bucket_name'], $opt['aws_s3_v3']['optional_prefix']));
$filesystem = new Filesystem(new AwsS3v3($client, $opt['aws_s3_v3']['bucket_name']));
break;
case 'copy_com':
$client = new API(
Expand Down

0 comments on commit e08ff91

Please sign in to comment.