Merge pull request #14 from stephandesouza/patch-1

Fixing major issues with all commands

Author: danielbachhuber

cli.php

@@ -34,7 +34,6 @@ function flush( $args = array(), $assoc_args = array() ) {
 				WP_CLI::error('There is no post with this permalink.');
 			}
 		} else {
-			global $file_prefix;
 			wp_cache_clean_cache( $file_prefix, true );
 			WP_CLI::success( 'Cache cleared.' );
 		}
@@ -44,11 +43,12 @@ function flush( $args = array(), $assoc_args = array() ) {
 	 * Get the status of the cache.
 	 */
 	function status( $args = array(), $assoc_args = array() ) {
+		require_once( WPCACHEHOME . '/wp-cache-phase1.php' );
+
 		$cache_stats = get_option( 'supercache_stats' );
 
 		if ( !empty( $cache_stats ) ) {
 			if ( $cache_stats['generated'] > time() - 3600 * 24 ) {
-				global $super_cache_enabled;
 				WP_CLI::line( 'Cache status: ' . ($super_cache_enabled ? '%gOn%n' : '%rOff%n') );
 				WP_CLI::line( 'Cache content on ' . date('r', $cache_stats['generated'] ) . ': ' );
 				WP_CLI::line();
@@ -71,7 +71,7 @@ function status( $args = array(), $assoc_args = array() ) {
 	 * Enable the WP Super Cache.
 	 */
 	function enable( $args = array(), $assoc_args = array() ) {
-		global $super_cache_enabled;
+		require_once( WPCACHEHOME . '/wp-cache-phase1.php' );
 
 		wp_super_cache_enable();
 
@@ -86,7 +86,7 @@ function enable( $args = array(), $assoc_args = array() ) {
 	 * Disable the WP Super Cache.
 	 */
 	function disable( $args = array(), $assoc_args = array() ) {
-		global $super_cache_enabled;
+		require_once( WPCACHEHOME . '/wp-cache-phase1.php' );
 
 		wp_super_cache_disable();
 
@@ -103,11 +103,12 @@ function disable( $args = array(), $assoc_args = array() ) {
 	 * @synopsis [--status] [--cancel]
 	 */
 	function preload( $args = array(), $assoc_args = array() ) {
-		global $super_cache_enabled;
+		require_once( WPCACHEHOME . '/wp-cache-phase1.php' );
+
 		$preload_counter = get_option( 'preload_cache_counter' );
 		$preloading      = is_array( $preload_counter ) && $preload_counter['c'] > 0;
 		$pending_cancel  = get_option( 'preload_cache_stop' );
-			
+
 		// Bail early if caching or preloading is disabled
 		if( ! $super_cache_enabled ) {
 			WP_CLI::error( 'The WP Super Cache is not enabled.' );
@@ -137,7 +138,7 @@ function preload( $args = array(), $assoc_args = array() ) {
 				WP_CLI::error( 'Not currently preloading.' );
 			}
 		}
-		 
+
 		// Start preloading if not already in progress
 		if ( $preloading ) {
 			WP_CLI::warning( 'Cache preloading is already in progress.' );
@@ -158,7 +159,7 @@ function preload( $args = array(), $assoc_args = array() ) {
 	protected function preload_status( $preload_counter, $pending_cancel ) {
 		if ( is_array( $preload_counter ) && $preload_counter['c'] > 0 ) {
 			WP_CLI::line( sprintf( 'Currently caching from post %d to %d.', $preload_counter[ 'c' ] - 100, $preload_counter[ 'c' ] ) );
-			
+
 			if ( $pending_cancel ) {
 				WP_CLI::warning( 'Pending preload cancel. It may take up to a minute for it to cancel completely.' );
 			}
@@ -175,4 +176,3 @@ protected function preload_status( $preload_counter, $pending_cancel ) {
 		}
 	}
 ) );
-