From f8623084a92d50e873fd0d90fd9481f8412ae911 Mon Sep 17 00:00:00 2001
From: sgiehl <stefangiehl@gmail.com>
Date: Mon, 12 Jul 2010 19:11:53 +0000
Subject: [PATCH] fixes #1467 always decode entities when format is json

git-svn-id: http://dev.piwik.org/svn/trunk@2480 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
 core/DataTable/Renderer/Json.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/DataTable/Renderer/Json.php b/core/DataTable/Renderer/Json.php
index 0ce45db6ba..33c0d46894 100644
--- a/core/DataTable/Renderer/Json.php
+++ b/core/DataTable/Renderer/Json.php
@@ -48,6 +48,11 @@ class Piwik_DataTable_Renderer_Json extends Piwik_DataTable_Renderer
 		{
 			$array = array('value' => $array);
 		}
+
+		// decode all entities
+		$callback = create_function('&$value,$key', '$value = html_entity_decode($value, ENT_QUOTES, "UTF-8");');
+		array_walk_recursive($array, $callback);
+		
 		$str = json_encode($array);
 		
 		return $this->jsonpWrap($str);
-- 
GitLab