Merge branch 'master' of github.com:piwik/piwik

1 files changed, 7 insertions, 1 deletions

diff --git a/core/CronArchive.php b/core/CronArchive.php
index 0f3e877de5..015298f37c 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -1122,12 +1122,18 @@ class CronArchive
 
     private function getVisitsLastPeriodFromApiResponse($stats)
     {
+        if(empty($stats)) {
+            return 0;
+        }
         $today = end($stats);
         return $today['nb_visits'];
     }
 
     private function getVisitsFromApiResponse($stats)
     {
+        if(empty($stats)) {
+            return 0;
+        }
         $visits = 0;
         foreach($stats as $metrics) {
             if(empty($metrics['nb_visits'])) {
@@ -1200,7 +1206,7 @@ class CronArchiveFatalException extends Exception
         $this->fullOutput = $fullOutput;
     }
 
-    public function logAndExit($cronArchiver)
+    public function logAndExit(CronArchive $cronArchiver)
     {
         if ($cronArchiver->isCoreInited()) {
             $cronArchiver->logError($this->getMessage());