Merge branch 'master' into 3.0-m03

Conflicts:
	core/Version.php
	core/WidgetsList.php
	plugins/CustomDimensions
	plugins/Goals/templates/getGoalReportView.twig
	plugins/Goals/templates/getOverviewView.twig
	tests/UI/expected-ui-screenshots

2 files changed, 8 insertions, 16 deletions

diff --git a/misc/cron/archive.php b/misc/cron/archive.php
index f719a2d3d4..0bc4daa1f1 100644
--- a/misc/cron/archive.php
+++ b/misc/cron/archive.php
@@ -22,18 +22,19 @@ define('PIWIK_ENABLE_SESSION_START', false);
 
 require_once PIWIK_INCLUDE_PATH . '/core/Common.php';
 
-if (!empty($_SERVER['argv'][0])) {
-    $callee = $_SERVER['argv'][0];
-} else {
-    $callee = '';
-}
+if (Piwik\Common::isPhpCliMode()) {
+    require_once PIWIK_INCLUDE_PATH . "/core/bootstrap.php";
+
+    $console = new Piwik\Console();
 
-if (false !== strpos($callee, 'archive.php')) {
+    // manipulate command line arguments so CoreArchiver command will be executed
+    $script = array_shift($_SERVER['argv']);
     $piwikHome = PIWIK_INCLUDE_PATH;
+
     echo "
 -------------------------------------------------------
 Using this 'archive.php' script is no longer recommended.
-Please use '/path/to/php $piwikHome/console core:archive " . implode('', array_slice($_SERVER['argv'], 1)) . "' instead.
+Please use '/path/to/php $piwikHome/console core:archive " . implode(' ', $_SERVER['argv']) . "' instead.
 To get help use '/path/to/php $piwikHome/console core:archive --help'
 See also: http://piwik.org/docs/setup-auto-archiving/
 
@@ -41,16 +42,7 @@ If you cannot use the console because it requires CLI
 try 'php archive.php --url=http://your.piwik/path'
 -------------------------------------------------------
 \n\n";
-}
 
-
-if (Piwik\Common::isPhpCliMode()) {
-    require_once PIWIK_INCLUDE_PATH . "/core/bootstrap.php";
-
-    $console = new Piwik\Console();
-
-    // manipulate command line arguments so CoreArchiver command will be executed
-    $script = array_shift($_SERVER['argv']);
     array_unshift($_SERVER['argv'], 'core:archive');
     array_unshift($_SERVER['argv'], $script);
 
diff --git a/misc/log-analytics b/misc/log-analytics
-Subproject f15f7271439380dbc7366aa117d3c8add358c26
+Subproject 45b09932404359f98bd44b43b09ea162bd0e3ca