Merge branch 'master' into 6176

5 files changed, 18 insertions, 12 deletions

diff --git a/plugins/Contents/API.php b/plugins/Contents/API.php
index 968231a702..574a24e9a3 100644
--- a/plugins/Contents/API.php
+++ b/plugins/Contents/API.php
@@ -57,8 +57,6 @@ class API extends \Piwik\Plugin\API
      */
     private function filterDataTable($dataTable)
     {
-        $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS));
-
         $dataTable->queueFilter('ReplaceColumnNames');
         $dataTable->queueFilter('ReplaceSummaryRowLabel');
         $dataTable->filter(function (DataTable $table) {
diff --git a/plugins/Contents/Archiver.php b/plugins/Contents/Archiver.php
index 6d3a2e05ce..ba8df12d79 100644
--- a/plugins/Contents/Archiver.php
+++ b/plugins/Contents/Archiver.php
@@ -48,7 +48,15 @@ class Archiver extends \Piwik\Plugin\Archiver
     public function aggregateMultipleReports()
     {
         $dataTableToSum = $this->getRecordNames();
-        $this->getProcessor()->aggregateDataTableRecords($dataTableToSum, $this->maximumRowsInDataTable, $this->maximumRowsInSubDataTable, $this->columnToSortByBeforeTruncation);
+        $columnsAggregationOperation = null;
+        $this->getProcessor()->aggregateDataTableRecords(
+            $dataTableToSum,
+            $this->maximumRowsInDataTable,
+            $this->maximumRowsInSubDataTable,
+            $this->columnToSortByBeforeTruncation,
+            $columnsAggregationOperation,
+            $columnsToRenameAfterAggregation = null,
+            $countRowsRecursive = array());
     }
 
     private function getRecordNames()
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
index 2f19e727d9..7b1f18f074 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
@@ -53,13 +53,13 @@
 				<interaction_rate>100%</interaction_rate>
 			</row>
 			<row>
-				<label>movie.mov</label>
+				<label>Content Piece not defined</label>
 				<nb_impressions>2</nb_impressions>
 				<nb_interactions>0</nb_interactions>
 				<interaction_rate>0%</interaction_rate>
 			</row>
 			<row>
-				<label>Content Piece not defined</label>
+				<label>movie.mov</label>
 				<nb_impressions>2</nb_impressions>
 				<nb_interactions>0</nb_interactions>
 				<interaction_rate>0%</interaction_rate>
@@ -102,11 +102,11 @@
 			</row>
 			<row>
 				<contentTarget />
-				<segment>contentPiece==movie.mov</segment>
 				
 			</row>
 			<row>
 				<contentTarget />
+				<segment>contentPiece==movie.mov</segment>
 				
 			</row>
 			<row>
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
index a7e56b692a..fb7e0486ad 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
@@ -41,23 +41,23 @@
 		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
-		<label>movie.mov</label>
+		<label>Content Piece not defined</label>
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
-		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
-		<label>Content Piece not defined</label>
+		<label>movie.mov</label>
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
+		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
 		<label>Unknown</label>
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
index 56da535eeb..512fcdb391 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
@@ -41,23 +41,23 @@
 		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
-		<label>movie.mov</label>
+		<label>Content Piece not defined</label>
 		<nb_visits>2</nb_visits>
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
-		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
-		<label>Content Piece not defined</label>
+		<label>movie.mov</label>
 		<nb_visits>2</nb_visits>
 		<nb_impressions>2</nb_impressions>
 		<nb_interactions>0</nb_interactions>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
+		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
 		<label>Unknown</label>