From 5c7cce869e1ed663cb395ae1603c36cb9043f64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr> Date: Wed, 4 Feb 2015 16:31:10 +0100 Subject: [PATCH] =?UTF-8?q?UploadController:=20correction=20du=20JSON=20re?= =?UTF-8?q?nvoy=C3=A9=20en=20cas=20d'exception.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/UploadController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Controller/UploadController.php b/Controller/UploadController.php index 13322703..a7776d86 100644 --- a/Controller/UploadController.php +++ b/Controller/UploadController.php @@ -279,14 +279,14 @@ class UploadController extends Controller { return $this->createResponse( $ex instanceof HttpException ? $ex->getStatusCode() : Response::HTTP_INTERNAL_SERVER_ERROR, - $ex->getMessage(), + preg_replace("/[\n\r]+/", " ", $ex->getMessage()), [ 'exception' => [ 'class' => get_class($ex), 'file' => $ex->getFile(), 'line' => $ex->getLine(), 'code' => $ex->getCode(), - 'trace' => $ex->getTraceAsString(), + 'trace' => $ex->getTrace(), ] ] ); -- GitLab