Merge pull request #890 from tim-moody/release-6.2-fixes4

appending response time to error responses breaks json
XSCE · Mar 13, 2017 · 80fc2ff · 80fc2ff
2 parents 7a64bd3 + b03388f
commit 80fc2ff
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/roles/xsce-admin/templates/console/cmd-service.php b/roles/xsce-admin/templates/console/cmd-service.php
@@ -53,7 +53,9 @@
 $time_end = microtime(true);
 $time = $time_end - $time_start;
 
-$reply = $reply . ',"Resp_time": "' . $time . '"}';
+if( strpos( $reply, "Error" ) == false ) {
+  $reply = $reply . ',"Resp_time": "' . $time . '"}';
+}
 
 // $time = microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]; php 5.4 up