Merge branch 'develop' into release/4.6.1

10up · Jul 5, 2023 · dc3fb86 · dc3fb86
2 parents 6fc3659 + a5f8ec3
commit dc3fb86
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/includes/classes/Command.php b/includes/classes/Command.php
@@ -1516,7 +1516,7 @@ protected function print_json_response( $response, $pretty ) {
 	 * @param boolean $pretty_print_flag Whether it should or not be formatted.
 	 */
 	protected function pretty_json_encode( $json_obj, $pretty_print_flag ) {
-		$flag = $pretty_print_flag ? JSON_PRETTY_PRINT : null;
+		$flag = $pretty_print_flag ? JSON_PRETTY_PRINT : 0;
 		WP_CLI::line( wp_json_encode( $json_obj, $flag ) );
 	}
 

diff --git a/includes/classes/StatusReport/FailedQueries.php b/includes/classes/StatusReport/FailedQueries.php
@@ -137,6 +137,15 @@ protected function maybe_clear_logs() {
 		}
 
 		$this->query_logger->clear_logs();
+
+		if ( defined( 'EP_IS_NETWORK' ) && EP_IS_NETWORK ) {
+			$redirect_url = network_admin_url( 'admin.php?page=elasticpress-status-report' );
+		} else {
+			$redirect_url = admin_url( 'admin.php?page=elasticpress-status-report' );
+		}
+
+		wp_safe_redirect( $redirect_url );
+		exit();
 	}
 
 	/**