diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-11-15 06:38:47 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-11-15 06:38:47 +0400 |
commit | c6d2177215e616042933246dab5496e621bb0907 (patch) | |
tree | 5c929cfa162a8fc242cb52a9f97d46baa91288a5 | |
parent | 3e5f6a5adb9e43f4dd6c1b364f62d898414929e6 (diff) |
refs #4278 Renames + New hook to let plugins modify idSites to archive
-rw-r--r-- | core/Archive.php | 4 | ||||
-rw-r--r-- | core/ArchiveProcessor.php | 8 | ||||
-rw-r--r-- | core/ArchiveProcessor/Parameters.php | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/core/Archive.php b/core/Archive.php index b95544dfbc..1f9d571fb8 100644 --- a/core/Archive.php +++ b/core/Archive.php @@ -610,7 +610,7 @@ class Archive continue; } - $this->prepareArchives($archiveGroups, $site, $period); + $this->prepareArchive($archiveGroups, $site, $period); } } } @@ -779,7 +779,7 @@ class Archive * @param $site * @param $period */ - private function prepareArchives(array $archiveGroups, Site $site, Period $period) + private function prepareArchive(array $archiveGroups, Site $site, Period $period) { $parameters = new ArchiveProcessor\Parameters($site, $period, $this->params->getSegment()); $archiveLoader = new ArchiveProcessor\Loader($parameters); diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php index 189f861b4c..b901c7fb6a 100644 --- a/core/ArchiveProcessor.php +++ b/core/ArchiveProcessor.php @@ -365,6 +365,10 @@ class ArchiveProcessor protected function enrichWithUniqueVisitorsMetric(Row $row) { + if(!$this->getParams()->isSingleSite() ) { + // we only compute unique visitors for a single site + return; + } if ( $row->getColumn('nb_uniq_visitors') !== false) { if (SettingsPiwik::isUniqueVisitorsEnabled($this->getParams()->getPeriod()->getLabel())) { $uniqueVisitors = (float)$this->computeNbUniqVisitors(); @@ -470,9 +474,7 @@ class ArchiveProcessor if($rowMetrics === false) { $rowMetrics = new Row; } - if($this->getParams()->isSingleSite() ) { - $this->enrichWithUniqueVisitorsMetric($rowMetrics); - } + $this->enrichWithUniqueVisitorsMetric($rowMetrics); $this->renameColumnsAfterAggregation($results); $metrics = $rowMetrics->getColumns(); diff --git a/core/ArchiveProcessor/Parameters.php b/core/ArchiveProcessor/Parameters.php index eaec67751f..70bb06e0ec 100644 --- a/core/ArchiveProcessor/Parameters.php +++ b/core/ArchiveProcessor/Parameters.php @@ -14,6 +14,7 @@ namespace Piwik\ArchiveProcessor; use Piwik\Date; use Piwik\Log; use Piwik\Period; +use Piwik\Piwik; use Piwik\Segment; use Piwik\Site; @@ -97,7 +98,12 @@ class Parameters public function getIdSites() { $idSite = $this->getSite()->getId(); - return array($idSite); + + $idSites = array($idSite); + + Piwik::postEvent('ArchiveProcessor.Parameters.getIdSites', array( &$idSites ) ); + + return $idSites; } /** |