Merge pull request #542 from humanmade/master

Port #536 and #541 to v3-branch
humanmade · Jul 30, 2021 · 8a1262d · 8a1262d
2 parents d47a596 + 94d4287
commit 8a1262d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/inc/class-plugin.php b/inc/class-plugin.php
@@ -144,7 +144,7 @@ public function tear_down() {
 	 */
 	public function register_stream_wrapper() {
 		if ( defined( 'S3_UPLOADS_USE_LOCAL' ) && S3_UPLOADS_USE_LOCAL ) {
-			stream_wrapper_register( 's3', 'S3_Uploads_Local_Stream_Wrapper', STREAM_IS_URL );
+			stream_wrapper_register( 's3', 'S3_Uploads\Local_Stream_Wrapper', STREAM_IS_URL );
 		} else {
 			Stream_Wrapper::register( $this );
 			$acl = defined( 'S3_UPLOADS_OBJECT_ACL' ) ? S3_UPLOADS_OBJECT_ACL : 'public-read';

diff --git a/s3-uploads.php b/s3-uploads.php
@@ -10,7 +10,7 @@
 
 require_once __DIR__ . '/inc/namespace.php';
 
-add_action( 'plugins_loaded', 'S3_Uploads\\init' );
+add_action( 'plugins_loaded', 'S3_Uploads\\init', 0 );
 
 if ( defined( 'WP_CLI' ) && WP_CLI ) {
 	WP_CLI::add_command( 's3-uploads', 'S3_Uploads\\WP_CLI_Command' );