Merge branch 'master' of https://github.com/BoldGrid/w3-total-cache into release-2.8.5

Author: cssjoe

Cli.php

@@ -563,17 +563,13 @@ public function pgcache_prime( array $args = array(), array $vars = array() ) {
 	public function alwayscached_process() {
 		if ( ! Extension_AlwaysCached_Plugin::is_enabled() ) {
 			\WP_CLI::error(
-				\sprintf(
-					// translators: 1: Error message.
-					\__( 'Always Cached feature is not enabled: %1$s', 'w3-total-cache' ),
-					$e->getMessage()
-				)
+				\__( 'Always Cached feature is not enabled.', 'w3-total-cache' )
 			);
 			return;
 		}
 
 		try {
-			Extension_AlwaysCached_Worker::run();
+			Extension_AlwaysCached_Worker::run( false );
 		} catch ( \Exception $e ) {
 			\WP_CLI::error(
 				\sprintf(
@@ -593,11 +589,7 @@ public function alwayscached_process() {
 	public function alwayscached_clear() {
 		if ( ! Extension_AlwaysCached_Plugin::is_enabled() ) {
 			\WP_CLI::error(
-				\sprintf(
-					// translators: 1: Error message.
-					\__( 'Always Cached feature is not enabled: %1$s', 'w3-total-cache' ),
-					$e->getMessage()
-				)
+				\__( 'Always Cached feature is not enabled', 'w3-total-cache' )
 			);
 			return;
 		}

Extension_AlwaysCached_Worker.php

@@ -23,9 +23,11 @@ class Extension_AlwaysCached_Worker {
 	 *
 	 * @since 2.8.0
 	 *
+	 * @param bool $html Print HTML.
+	 *
 	 * @return void
 	 */
-	public static function run() {
+	public static function run( $html = true ) {
 		$timeslot_seconds = 60;
 		$timeslot_seconds = apply_filters(
 			'w3tc_alwayscached_worker_timeslot',
@@ -34,26 +36,30 @@ public static function run() {
 
 		$time_exit = time() + $timeslot_seconds;
 
-		echo '<div style="white-space: pre-line;">';
+		if ( $html ) {
+			echo '<div style="white-space: pre-line;">';
+		}
 
-		esc_html_e( "Processing queue.\n", 'w3-total-cache' );
+		esc_html_e( 'Processing queue.', 'w3-total-cache' );
 
-		for ( ; ; ) {
+		// Infinite loop to process queue items until the time slot is exhausted or the queue is empty.
+		while ( true ) {
 			if ( time() >= $time_exit ) {
-				esc_html_e( "\n\nQueue worker time slot exhaused.", 'w3-total-cache' );
+				esc_html_e( "\nQueue worker time slot exhaused.", 'w3-total-cache' );
 				break;
 			}
 
 			$item = Extension_AlwaysCached_Queue::pop_item_begin();
 
 			if ( empty( $item ) ) {
-				esc_html_e( "\n\nQueue is empty.", 'w3-total-cache' );
+				esc_html_e( "\nQueue is empty.", 'w3-total-cache' );
 				break;
 			}
 
 			echo esc_html( sprintf( "\n%s ", $item['key'] ) );
 
 			$result = self::process_item( $item );
+
 			if ( 'ok' === $result ) {
 				esc_html_e( 'ok', 'w3-total-cache' );
 				Extension_AlwaysCached_Queue::pop_item_finish( $item );
@@ -65,7 +71,11 @@ public static function run() {
 			}
 		}
 
-		echo "\n</div>\n";
+		if ( $html ) {
+			echo "\n</div>\n";
+		} else {
+			echo "\n";
+		}
 	}
 
 	/**