Fixing build.

5 files changed, 12 insertions, 9 deletions

diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php
index 21b12aefed..0a2148b030 100644
--- a/core/API/DataTableManipulator/Flattener.php
+++ b/core/API/DataTableManipulator/Flattener.php
@@ -130,5 +130,6 @@ class Flattener extends DataTableManipulator
     protected function manipulateSubtableRequest(&$request)
     {
         unset($request['flat']);
+        $request['disable_queued_filters'] = 1;
     }
 }
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index 4478f7fa52..10c3a00132 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -309,7 +309,7 @@ class ResponseBuilder
         $datatable->queueFilter('SafeDecodeLabel');
 
         // if the flag disable_queued_filters is defined we skip the filters that were queued
-        if (Common::getRequestVar('disable_queued_filters', '0', 'string', $this->request) == 0) {
+        if (Common::getRequestVar('disable_queued_filters', 0, 'int', $this->request) == 0) {
             $datatable->applyQueuedFilters();
         }
 
diff --git a/plugins/Referers/API.php b/plugins/Referers/API.php
index 8bdc379a42..e3f57948a0 100644
--- a/plugins/Referers/API.php
+++ b/plugins/Referers/API.php
@@ -231,15 +231,15 @@ class API
     public function getSearchEnginesFromKeywordId($idSite, $period, $date, $idSubtable, $segment = false)
     {
         $dataTable = $this->getDataTable(Archiver::KEYWORDS_RECORD_NAME, $idSite, $period, $date, $segment, $expanded = false, $idSubtable);
-        $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSearchEngineUrlFromName'));
-        $dataTable->queueFilter('MetadataCallbackAddMetadata', array('url', 'logo', __NAMESPACE__ . '\getSearchEngineLogoFromUrl'));
+        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSearchEngineUrlFromName'));
+        $dataTable->filter('MetadataCallbackAddMetadata', array('url', 'logo', __NAMESPACE__ . '\getSearchEngineLogoFromUrl'));
 
         // get the keyword and create the URL to the search result page
         $keywords = $this->getKeywords($idSite, $period, $date, $segment);
         $subTable = $keywords->getRowFromIdSubDataTable($idSubtable);
         if ($subTable) {
             $keyword = $subTable->getColumn('label');
-            $dataTable->queueFilter('MetadataCallbackReplace', array('url', __NAMESPACE__ . '\getSearchEngineUrlFromUrlAndKeyword', array($keyword)));
+            $dataTable->filter('MetadataCallbackReplace', array('url', __NAMESPACE__ . '\getSearchEngineUrlFromUrlAndKeyword', array($keyword)));
         }
         return $dataTable;
     }
@@ -247,8 +247,8 @@ class API
     public function getSearchEngines($idSite, $period, $date, $segment = false, $expanded = false)
     {
         $dataTable = $this->getDataTable(Archiver::SEARCH_ENGINES_RECORD_NAME, $idSite, $period, $date, $segment, $expanded);
-        $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSearchEngineUrlFromName'));
-        $dataTable->queueFilter('MetadataCallbackAddMetadata', array('url', 'logo', __NAMESPACE__ . '\getSearchEngineLogoFromUrl'));
+        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSearchEngineUrlFromName'));
+        $dataTable->filter('MetadataCallbackAddMetadata', array('url', 'logo', __NAMESPACE__ . '\getSearchEngineLogoFromUrl'));
         return $dataTable;
     }
 
@@ -277,7 +277,7 @@ class API
 
         if (!empty($subTableRow)) {
             $searchEngineUrl = $subTableRow->getMetadata('url');
-            $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSearchEngineUrlFromKeywordAndUrl', array($searchEngineUrl)));
+            $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSearchEngineUrlFromKeywordAndUrl', array($searchEngineUrl)));
         }
         $dataTable = $this->handleKeywordNotDefined($dataTable);
         return $dataTable;
diff --git a/tests/PHPUnit/Integration/RowEvolutionTest.php b/tests/PHPUnit/Integration/RowEvolutionTest.php
index d93f6560fb..b0e1250000 100755
--- a/tests/PHPUnit/Integration/RowEvolutionTest.php
+++ b/tests/PHPUnit/Integration/RowEvolutionTest.php
@@ -232,5 +232,4 @@ class Test_Piwik_Integration_RowEvolution extends IntegrationTestCase
 }
 
 Test_Piwik_Integration_RowEvolution::$fixture
-    = new Test_Piwik_Fixture_TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers();
-
+    = new Test_Piwik_Fixture_TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers();
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referers.getSearchEngines_month.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referers.getSearchEngines_month.xml
index 1eaef548bc..5079a65055 100644
--- a/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referers.getSearchEngines_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referers.getSearchEngines_month.xml
@@ -10,6 +10,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
 		<url>http://google.com/search?q=free+%3E+proprietary</url>
+		<logo>plugins/Referers/images/searchEngines/google.com.png</logo>
 	</row>
 	<row>
 		<label>Google - justice )(&amp;^#%$ not corruption!</label>
@@ -21,6 +22,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<url>http://google.com/search?q=justice+%29%28%26%5E%23%25%24+not+corruption%21</url>
+		<logo>plugins/Referers/images/searchEngines/google.com.png</logo>
 	</row>
 	<row>
 		<label>Google - peace &quot;,&quot; not war</label>
@@ -32,5 +34,6 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<url>http://google.com/search?q=peace+%22%2C%22+not+war</url>
+		<logo>plugins/Referers/images/searchEngines/google.com.png</logo>
 	</row>
 </result>
\ No newline at end of file