From 04e3b93fea8ed2ccfe911ce56507e8c5c9091491 Mon Sep 17 00:00:00 2001 From: mattab Date: Sat, 6 Dec 2014 00:17:25 +1300 Subject: Re-ordering $orderBy, $groupBy --> $groupBy, $orderBy as it's proper order in SQL logic --- plugins/Contents/Archiver.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/Contents/Archiver.php') diff --git a/plugins/Contents/Archiver.php b/plugins/Contents/Archiver.php index 45607bd7b7..6d3a2e05ce 100644 --- a/plugins/Contents/Archiver.php +++ b/plugins/Contents/Archiver.php @@ -117,7 +117,7 @@ class Archiver extends \Piwik\Plugin\Archiver $rankingQuery->addColumn(array(Metrics::INDEX_CONTENT_NB_IMPRESSIONS, Metrics::INDEX_NB_VISITS), 'sum'); } - $resultSet = $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, $rankingQuery); + $resultSet = $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, $rankingQuery); while ($row = $resultSet->fetch()) { $this->aggregateImpressionRow($row); @@ -174,14 +174,14 @@ class Archiver extends \Piwik\Plugin\Archiver $rankingQuery->addColumn(array(Metrics::INDEX_CONTENT_NB_INTERACTIONS), 'sum'); } - $resultSet = $this->archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, $rankingQuery); + $resultSet = $this->archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, $rankingQuery); while ($row = $resultSet->fetch()) { $this->aggregateInteractionRow($row); } } - private function archiveDayQueryProcess($select, $from, $where, $orderBy, $groupBy, RankingQuery $rankingQuery) + private function archiveDayQueryProcess($select, $from, $where, $groupBy, $orderBy, RankingQuery $rankingQuery) { // get query with segmentation $query = $this->getLogAggregator()->generateQuery($select, $from, $where, $groupBy, $orderBy); -- cgit v1.2.3