Merge branch '2453-Llamada-a-la-api-no-funciona-en-formato-json-dev' into 'develop'

Fixed json in functions_api See merge request artica/pandorafms!1595
2018-07-04 16:33:20 +02:00 · 2018-07-04 16:33:20 +02:00 · 8d8b6ffe51
parent 5723cfca15 b186c82a7b
commit 8d8b6ffe51
1 changed files with 7 additions and 1 deletions
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@ -180,7 +180,13 @@ function returnData($returnType, $data, $separator = ';') {
 			if ($separator == ";") {
 				$separator = null;
 			}
-			echo json_encode ($data, $separator);
+			
+			if(empty($separator)){
+				echo json_encode ($data);
+			} else {
+				echo json_encode ($data, $separator);
+			}
+			
 			break;
 	}
 }