Merge pull request #18 from jrfnl/Alternative-json-pretty-print

Use native JSON pretty printing if available
YahnisElsts · Sep 10, 2014 · 631a40c · 631a40c
2 parents 3d21b62 + e799ef3
commit 631a40c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/includes/Wpup/UpdateServer.php b/includes/Wpup/UpdateServer.php
@@ -256,9 +256,13 @@ protected function filterLogInfo($columns) {
 	 */
 	protected function outputAsJson($response) {
 		header('Content-Type: application/json');
-		$output = json_encode($response);
-		if ( function_exists('wsh_pretty_json') ) {
-			$output = wsh_pretty_json($output);
+		$output = '';
+		if ( defined('JSON_PRETTY_PRINT') ) {
+			$output = json_encode($response, JSON_PRETTY_PRINT);
+		} elseif ( function_exists('wsh_pretty_json') ) {
+			$output = wsh_pretty_json(json_encode($response));
+		} else {
+			$output = json_encode($response);
 		}
 		echo $output;
 	}