From 4886d64858b07b0f98c08d9e02ff70c213beaf7b Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Thu, 28 Nov 2013 04:30:37 +0000
Subject: [PATCH] fix json renderer does not return valid json if message
contains text like "Piwik\Plugins\Foobar\Piwik_AddMenu()"
---
core/DataTable/Renderer/Json.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/DataTable/Renderer/Json.php b/core/DataTable/Renderer/Json.php
index 83d888ed5e..6927a6b004 100644
--- a/core/DataTable/Renderer/Json.php
+++ b/core/DataTable/Renderer/Json.php
@@ -46,9 +46,10 @@ class Json extends Renderer
$exceptionMessage = $this->getExceptionMessage();
$exceptionMessage = str_replace(array("\r\n", "\n"), "", $exceptionMessage);
- $exceptionMessage = '{"result":"error", "message":"' . $exceptionMessage . '"}';
- return $this->jsonpWrap($exceptionMessage);
+ $result = json_encode(array('result' => 'error', 'message' => $exceptionMessage));
+
+ return $this->jsonpWrap($result);
}
/**
--
GitLab