Commit 39ecddb8 authored by Eric Mann's avatar Eric Mann
Browse files

Late enable the plugin for CLI operations/migrations

parent 37ae2290

inc/class-s3-uploads-wp-cli-command.php

+10 −2
Original line number Diff line number Diff line
@@ -71,7 +71,11 @@ class S3_Uploads_WP_CLI_Command extends WP_CLI_Command { 
		WP_CLI::success( 'Moved all attachment to S3. If you wish to update references in your database run: ' );

		WP_CLI::line( '' );



		$old_upload_dir = S3_Uploads::get_instance()->get_original_upload_dir();

		// Esnure things are active

		$instance = S3_Uploads::get_instance();

		$instance->register_stream_wrapper();



		$old_upload_dir = $instance->get_original_upload_dir();

		$upload_dir = wp_upload_dir();



		WP_CLI::Line( sprintf( 'wp search-replace "%s" "%s"', $old_upload_dir['baseurl'], $upload_dir['baseurl'] ) );
@@ -85,7 +89,11 @@ class S3_Uploads_WP_CLI_Command extends WP_CLI_Command { 
	 */

	public function migrate_attachment_to_s3( $args, $args_assoc ) {



		$old_upload_dir = S3_Uploads::get_instance()->get_original_upload_dir();

		// Ensure things are active

		$instance = S3_Uploads::get_instance();

		$instance->register_stream_wrapper();



		$old_upload_dir = $instance->get_original_upload_dir();

		$upload_dir = wp_upload_dir();



		$files = array( get_post_meta( $args[0], '_wp_attached_file', true ) );

s3-uploads.php

+2 −3
Original line number Diff line number Diff line
@@ -21,9 +21,8 @@ function s3_uploads_init() { 
		return;

	}



	// Make sure the plugin is enabled when autoenable is on, or in a CLI system (so the migrate command works)

	if ( ( ! defined( 'WP_CLI') || ! WP_CLI ) &&                                      // If CLI is enabled, skip our other checks

	     ( defined( 'S3_UPLOADS_AUTOENABLE' ) && false === S3_UPLOADS_AUTOENABLE ) && // If the constant is used and set to false, skip

	// Make sure the plugin is enabled when autoenable is on

	if ( ( defined( 'S3_UPLOADS_AUTOENABLE' ) && false === S3_UPLOADS_AUTOENABLE ) && // If the constant is used and set to false, skip

	     'enabled' !== get_option( 's3_uploads_enabled' ) ) {                         // If the plugin is not enabled, skip

		return;

	}