Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2013-11-13 08:04:24 +0400
committermattab <matthieu.aubry@gmail.com>2013-11-13 08:04:24 +0400
commit0518d45f476c52349cddcf5aca309f78f6b01656 (patch)
tree421815a279ba2c494c0d4f847540a700a094d3c0 /core/ArchiveProcessor.php
parentf152d6d3d9ac16487df76971176edc11d5fb1cf9 (diff)
Refs #4278 to process unique visitors, isSingleSite() is required (no unique visitors cross-sites for now)
Diffstat (limited to 'core/ArchiveProcessor.php')
-rw-r--r--core/ArchiveProcessor.php14
1 files changed, 7 insertions, 7 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])) {