Commit 52800e08 authored by Ryan McCue's avatar Ryan McCue Committed by GitHub
Browse files

Merge pull request #172 from humanmade/allow-external-aws-sdk 

Allow external AWS SDK
parents 8051da95 d8a8f57b

composer.json

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
	},

	"type": "wordpress-plugin",

	"require": {

		"composer/installers": "~1.0"

		"composer/installers": "~1.0",

		"aws/aws-sdk-php": "~3.18"

	 }

}

s3-uploads.php

+6 −3
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ if ( defined( 'WP_CLI' ) && WP_CLI ) { 
add_action( 'plugins_loaded', 's3_uploads_init' );



function s3_uploads_init() {

	// Ensure the AWS SDK can be loaded.

	if ( ! class_exists( '\\Aws\\S3\\S3Client' ) ) {

		// Require AWS Autoloader file.

		require_once dirname( __FILE__ ) . '/lib/aws-sdk/aws-autoloader.php';

	}



	if ( ! s3_uploads_check_requirements() ) {

		return;

	}
@@ -107,6 +113,3 @@ function s3_uploads_autoload( $class_name ) { 
}



spl_autoload_register( 's3_uploads_autoload' );
 


// Require AWS Autoloader file.

require_once dirname( __FILE__ ) . '/lib/aws-sdk/aws-autoloader.php';