fix missing whitespace between parameters in help text when using archive.php on cli

1 files changed, 4 insertions, 11 deletions

diff --git a/misc/cron/archive.php b/misc/cron/archive.php
index f719a2d3d4..5410ed7a1f 100644
--- a/misc/cron/archive.php
+++ b/misc/cron/archive.php
@@ -22,18 +22,15 @@ 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()) {
+    $script = array_shift($_SERVER['argv']);
+    $args   = implode(' ', $_SERVER['argv']);
 
-if (false !== strpos($callee, 'archive.php')) {
     $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 " . $args . "' instead.
 To get help use '/path/to/php $piwikHome/console core:archive --help'
 See also: http://piwik.org/docs/setup-auto-archiving/
 
@@ -41,16 +38,12 @@ 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);