From 0518d45f476c52349cddcf5aca309f78f6b01656 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Wed, 13 Nov 2013 17:04:24 +1300
Subject: Refs #4278 to process unique visitors, isSingleSite() is required (no
 unique visitors cross-sites for now)

---
 core/ArchiveProcessor.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'core/ArchiveProcessor.php')

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])) {
-- 
cgit v1.2.3