Fixing build for Json array rendering bug.

2 files changed, 7 insertions, 3 deletions

diff --git a/plugins/API/Renderer/Json.php b/plugins/API/Renderer/Json.php
index 401a4e1a5a..9604859757 100644
--- a/plugins/API/Renderer/Json.php
+++ b/plugins/API/Renderer/Json.php
@@ -52,7 +52,9 @@ class Json extends ApiRenderer
         $result = $this->renderDataTable($array);
 
         // if $array is a simple associative array, remove the JSON root array that is added by renderDataTable
-        if (Piwik::isAssociativeArray($array)) {
+        if (!empty($array)
+            && Piwik::isAssociativeArray($array)
+        ) {
             $result = substr($result, 1, strlen($result) - 2);
         }
 
diff --git a/plugins/API/tests/JsonRendererTest.php b/plugins/API/tests/JsonRendererTest.php
index 366c22efe2..a840305c70 100644
--- a/plugins/API/tests/JsonRendererTest.php
+++ b/plugins/API/tests/JsonRendererTest.php
@@ -249,8 +249,9 @@ class JsonRendererTest extends \PHPUnit_Framework_TestCase
         $input = array('nb_visits' => 6, 'nb_random' => 8);
 
         $response = $this->jsonBuilder->renderArray($input);
+        $expected = json_encode($input);
 
-        $this->assertEquals('[{"nb_visits":6,"nb_random":8}]', $response);
+        $this->assertEquals($expected, $response);
         $this->assertNoJsonError($response);
     }
 
@@ -262,8 +263,9 @@ class JsonRendererTest extends \PHPUnit_Framework_TestCase
         );
 
         $response = $this->jsonBuilder->renderArray($input);
+        $expected = json_encode($input);
 
-        $this->assertEquals('[{"nb_visits":6,"nb_random":8},{"nb_visits":3,"nb_random":4}]', $response);
+        $this->assertEquals($expected, $response);
         $this->assertNoJsonError($response);
     }