diff options
-rw-r--r-- | core/ArchiveProcessor.php | 14 | ||||
-rw-r--r-- | core/ArchiveProcessor/Parameters.php | 7 | ||||
-rw-r--r-- | plugins/ExamplePlugin/API.php | 1 |
3 files changed, 13 insertions, 9 deletions
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php index c09cd3b611..189f861b4c 100644 --- a/core/ArchiveProcessor.php +++ b/core/ArchiveProcessor.php @@ -367,7 +367,8 @@ class ArchiveProcessor { if ( $row->getColumn('nb_uniq_visitors') !== false) { if (SettingsPiwik::isUniqueVisitorsEnabled($this->getParams()->getPeriod()->getLabel())) { - $row->setColumn('nb_uniq_visitors', (float)$this->computeNbUniqVisitors()); + $uniqueVisitors = (float)$this->computeNbUniqVisitors(); + $row->setColumn('nb_uniq_visitors', $uniqueVisitors); } else { $row->deleteColumn('nb_uniq_visitors'); } @@ -466,16 +467,15 @@ class ArchiveProcessor } $rowMetrics = $results->getFirstRow(); - if($this->getParams()->isSingleSiteDayArchive()) { + if($rowMetrics === false) { + $rowMetrics = new Row; + } + if($this->getParams()->isSingleSite() ) { $this->enrichWithUniqueVisitorsMetric($rowMetrics); } $this->renameColumnsAfterAggregation($results); - if ($rowMetrics === false) { - $metrics = array(); - } else { - $metrics = $rowMetrics->getColumns(); - } + $metrics = $rowMetrics->getColumns(); foreach ($columns as $name) { if (!isset($metrics[$name])) { diff --git a/core/ArchiveProcessor/Parameters.php b/core/ArchiveProcessor/Parameters.php index f662ebd276..108ec126a7 100644 --- a/core/ArchiveProcessor/Parameters.php +++ b/core/ArchiveProcessor/Parameters.php @@ -141,11 +141,16 @@ class Parameters */ public function isSingleSiteDayArchive() { - $oneSite = count($this->getIdSites()) == 1; + $oneSite = $this->isSingleSite(); $oneDay = $this->getPeriod()->getLabel() == 'day'; return $oneDay && $oneSite; } + public function isSingleSite() + { + return count($this->getIdSites()) == 1; + } + public function logStatusDebug($isTemporary) { $temporary = 'definitive archive'; diff --git a/plugins/ExamplePlugin/API.php b/plugins/ExamplePlugin/API.php index 5f4eb4b14c..02e0a01463 100644 --- a/plugins/ExamplePlugin/API.php +++ b/plugins/ExamplePlugin/API.php @@ -31,7 +31,6 @@ class API extends \Piwik\Plugin\API public function getAnswerToLife($truth = true) { if ($truth) { - return 42; } |