Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-08-04 19:59:16 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-08-06 11:02:58 +0400
commita25dbb7ec72c0b2b48256fbb45a80d36e7d0dc51 (patch)
tree4cc4323a8fbfa6cac639b7755431e79579f063b8 /core
parenta8210d0804023523c2d85c92d74ffa2c195bf5d8 (diff)
refs #5896 added a couple of tests and fixed some issues
Diffstat (limited to 'core')
-rw-r--r--core/API/ResponseBuilder.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index 987d5bbc89..5943fdd442 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -223,6 +223,10 @@ class ResponseBuilder
$isAssoc = !empty($firstArray) && is_numeric($firstKey) && is_array($firstArray) && !Piwik::isMultiDimensionalArray($array) && count(array_filter(array_keys($firstArray), 'is_string'));
if ($isAssoc) {
+ if ('original' == $this->outputFormat) {
+ return $this->apiRenderer->renderArray($array);
+ }
+
$dataTable = DataTable::makeFromSimpleArray($array);
return $this->handleDataTable($dataTable);
}