Refs #3465, fix regression for flattener filter where queued filters were...

Refs #3465, fix regression for flattener filter where queued filters were applied on the flattened datatable.

core/API/DataTableManipulator/Flattener.php

@@ -61,7 +61,7 @@ class Piwik_API_DataTableManipulator_Flattener extends Piwik_API_DataTableManipu
      */
     protected function manipulateDataTable($dataTable)
     {
-        $newDataTable = $dataTable->getEmptyClone();
+        $newDataTable = $dataTable->getEmptyClone($keepFilters = false);
         foreach ($dataTable->getRows() as $row) {
             $this->flattenRow($row, $newDataTable);
         }
@@ -77,7 +77,6 @@ class Piwik_API_DataTableManipulator_Flattener extends Piwik_API_DataTableManipu
     private function flattenRow(Piwik_DataTable_Row $row, Piwik_DataTable $dataTable,
                                 $labelPrefix = '', $parentLogo = false)
     {
-
         $label = $row->getColumn('label');
         if ($label !== false) {
             $label = trim($label);

core/DataTable.php

@@ -506,10 +506,12 @@ class Piwik_DataTable
      *
      * @return Piwik_DataTable
      */
-    public function getEmptyClone()
+    public function getEmptyClone($keepFilters = true)
     {
         $clone = new Piwik_DataTable;
-        $clone->queuedFilters = $this->queuedFilters;
+        if ($keepFilters) {
+            $clone->queuedFilters = $this->queuedFilters;
+        }
         $clone->metadata = $this->metadata;
         return $clone;
     }

tests/PHPUnit/Integration/RowEvolutionTest.php

@@ -152,7 +152,19 @@ class Test_Piwik_Integration_RowEvolution extends IntegrationTestCase
                 'apiAction' => 'getBrowser',
                 'label'     => 'Firefox,Chrome,Opera'
             )
-
+        ));
+        
+        // (non-rowevolution test) test flattener w/ search engines to make sure
+        // queued filters are not applied twice
+        $return[] = array('Referers.getSearchEngines', array(
+            'testSuffix'             => '_flatFilters',
+            'periods'                => 'month',
+            'idSite'                 => $idSite,
+            'date'                   => '2010-02-01',
+            'otherRequestParameters' => array(
+                'flat'               => 1,
+                'expanded'           => '0'
+            )
         ));
 
         return $return;

tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referers.getSearchEngines_month.xml

+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<label>Google - free &gt; proprietary</label>
+		<nb_visits>9</nb_visits>
+		<nb_actions>9</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>9</bounce_count>
+		<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>
+	</row>
+	<row>
+		<label>Google - justice )(&amp;^#%$ not corruption!</label>
+		<nb_visits>8</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>8</bounce_count>
+		<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>
+	</row>
+	<row>
+		<label>Google - peace &quot;,&quot; not war</label>
+		<nb_visits>8</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>8</bounce_count>
+		<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>
+	</row>
+</result>
\ No newline at end of file