From 644b63fd6035fd8d0b113e8ce71629af0378e738 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Thu, 3 Apr 2014 22:38:21 +1300
Subject: [PATCH] Fix notice

---
 core/CronArchive.php                          | 4 ++--
 plugins/CoreConsole/Commands/CoreArchiver.php | 4 ++--
 plugins/CustomAlerts                          | 2 +-
 tests/PHPUnit/UI                              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/CronArchive.php b/core/CronArchive.php
index 015298f37ca..f77ae239832 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -540,7 +540,7 @@ private function archiveVisitsAndSegments($idsite, $period, $lastTimestampWebsit
 
         $url .= self::APPEND_TO_API_REQUEST;
 
-        $visitsInLastPeriods = 0;
+        $visitsInLastPeriods = $visitsLastPeriod = 0;
         $success = true;
 
         $urls = array();
@@ -1206,7 +1206,7 @@ public function __construct($message, $fullOutput = null)
         $this->fullOutput = $fullOutput;
     }
 
-    public function logAndExit(CronArchive $cronArchiver)
+    public function logAndExit(CronArchive$cronArchiver)
     {
         if ($cronArchiver->isCoreInited()) {
             $cronArchiver->logError($this->getMessage());
diff --git a/plugins/CoreConsole/Commands/CoreArchiver.php b/plugins/CoreConsole/Commands/CoreArchiver.php
index eae8d80f514..0fe60d3bc96 100644
--- a/plugins/CoreConsole/Commands/CoreArchiver.php
+++ b/plugins/CoreConsole/Commands/CoreArchiver.php
@@ -46,8 +46,8 @@ static public function configureArchiveCommand(ConsoleCommand $command)
         $command->addOption('force-all-periods', null, InputOption::VALUE_OPTIONAL, "Limits archiving to websites with some traffic in the last [seconds] seconds. \nFor example --force-all-periods=86400 will archive websites that had visits in the last 24 hours. \nIf [seconds] is not specified, all websites with visits in the last " . CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE . "\n seconds (" . round(CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE / 86400) . " days) will be archived.");
         $command->addOption('force-timeout-for-periods', null, InputOption::VALUE_OPTIONAL, "The current week/ current month/ current year will be processed at most every [seconds].\nIf not specified, defaults to " . CronArchive::SECONDS_DELAY_BETWEEN_PERIOD_ARCHIVES . ".");
         $command->addOption('force-date-last-n', null, InputOption::VALUE_REQUIRED, "This script calls the API with period=lastN. You can force the N in lastN by specifying this value.");
-        $command->addOption("force-idsites", null, InputOption::VALUE_OPTIONAL, 'If specified, archiving will be processed only for these Sites Ids (comma separated)');
-        $command->addOption("skip-idsites", null, InputOption::VALUE_OPTIONAL, 'If specified, archiving will be skipped for these websites (in case these website ids would have been archived).');
+        $command->addOption('force-idsites', null, InputOption::VALUE_OPTIONAL, 'If specified, archiving will be processed only for these Sites Ids (comma separated)');
+        $command->addOption('skip-idsites', null, InputOption::VALUE_OPTIONAL, 'If specified, archiving will be skipped for these websites (in case these website ids would have been archived).');
         $command->addOption('disable-scheduled-tasks', null, InputOption::VALUE_NONE, "Skips executing Scheduled tasks (sending scheduled reports, db optimization, etc.).");
         $command->addOption('xhprof', null, InputOption::VALUE_NONE, "Enables XHProf profiler for this archive.php run. Requires XHPRof (see tests/README.xhprof.md).");
         $command->addOption('accept-invalid-ssl-certificate', null, InputOption::VALUE_NONE, "It is _NOT_ recommended to use this argument. Instead, you should use a valid SSL certificate!\nIt can be useful if you specified --url=https://... or if you are using Piwik with force_ssl=1");
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index c9edd879003..a1125e96827 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit c9edd879003ca7a9f75d81fe07ec6ff0c2340f91
+Subproject commit a1125e96827e12c7bd5c3d6107b9c162aace32f8
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 6e2b0993fda..a878862448d 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 6e2b0993fda17b6c4c2ac407c69fc09a1867dcd9
+Subproject commit a878862448d37eafb1c3896cc97acc553aca1f75