From 1c672234176c77ed7a8771e23d5177e9b7009566 Mon Sep 17 00:00:00 2001
From: Thomas Steur <tsteur@users.noreply.github.com>
Date: Tue, 1 Dec 2015 17:33:53 +1300
Subject: [PATCH] Do not serialize API request otherwise
---
core/API/Request.php | 1 +
plugins/CustomVariables/API.php | 2 +-
plugins/Goals/API.php | 1 -
plugins/MultiSites/API.php | 1 -
plugins/Overlay/Controller.php | 1 -
plugins/VisitFrequency/API.php | 1 -
tests/PHPUnit/Integration/ReportTest.php | 6 ++++--
7 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/core/API/Request.php b/core/API/Request.php
index 8ec38f50aa..6ddb8333f5 100644
--- a/core/API/Request.php
+++ b/core/API/Request.php
@@ -388,6 +388,7 @@ class Request
{
$params = array();
$params['format'] = 'original';
+ $params['serialize'] = '0';
$params['module'] = 'API';
$params['method'] = $method;
$params = $paramOverride + $params;
diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php
index c737ae3a93..69e6ee720c 100644
--- a/plugins/CustomVariables/API.php
+++ b/plugins/CustomVariables/API.php
@@ -142,7 +142,7 @@ class API extends \Piwik\Plugin\API
$date = '2008-12-12,' . $today;
$customVarUsages = Request::processRequest('CustomVariables.getCustomVariables',
array('idSite' => $idSite, 'period' => 'range', 'date' => $date,
- 'format' => 'original', 'serialize' => '0')
+ 'format' => 'original')
);
foreach ($customVarUsages->getRows() as $row) {
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index 80a898fe34..113bea5ec9 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -365,7 +365,6 @@ class API extends \Piwik\Plugin\API
'date' => $date,
'idGoal' => $idGoal,
'columns' => $columns,
- 'serialize' => '0',
'format_metrics' => 'bc'
));
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index 60b9fab90a..23ae821738 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -147,7 +147,6 @@ class API extends \Piwik\Plugin\API
'limit' => SettingsPiwik::getWebsitesCountToDisplay(),
'showColumns' => '',
'hideColumns' => '',
- 'serialize' => 0,
'format' => 'original'));
if (!empty($sites)) {
diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php
index 2ed50641c5..6327d34ddf 100644
--- a/plugins/Overlay/Controller.php
+++ b/plugins/Overlay/Controller.php
@@ -85,7 +85,6 @@ class Controller extends \Piwik\Plugin\Controller
'label' => $label,
'format' => 'original',
'format_metrics' => 0,
- 'serialize' => '0'
);
if (!empty($segment)) {
diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php
index a6f9971480..550212d9e3 100644
--- a/plugins/VisitFrequency/API.php
+++ b/plugins/VisitFrequency/API.php
@@ -45,7 +45,6 @@ class API extends \Piwik\Plugin\API
'segment' => $segment,
'columns' => implode(',', $columns),
'format' => 'original',
- 'serialize' => 0, // tests set this to 1
'format_metrics' => 0
);
diff --git a/tests/PHPUnit/Integration/ReportTest.php b/tests/PHPUnit/Integration/ReportTest.php
index 8e535be0f2..b71246d36c 100644
--- a/tests/PHPUnit/Integration/ReportTest.php
+++ b/tests/PHPUnit/Integration/ReportTest.php
@@ -474,7 +474,8 @@ class ReportTest extends IntegrationTestCase
'format' => 'original',
'module' => 'API',
'method' => 'ExampleReport.getExampleReport',
- 'format_metrics' => 'bc'
+ 'format_metrics' => 'bc',
+ 'serialize' => '0'
)
)->willReturn("result");
Proxy::setSingletonInstance($proxyMock);
@@ -497,7 +498,8 @@ class ReportTest extends IntegrationTestCase
'format' => 'original',
'module' => 'API',
'method' => 'Referrers.getSearchEnginesFromKeywordId',
- 'format_metrics' => 'bc'
+ 'format_metrics' => 'bc',
+ 'serialize' => '0'
)
)->willReturn("result");
Proxy::setSingletonInstance($proxyMock);
--
GitLab