Fix merge conflict for b3ad4d8

1 files changed, 3 insertions, 4 deletions

diff --git a/misc/cron/archive.php b/misc/cron/archive.php
index 3f6e867fd6..6bb0de5011 100644
--- a/misc/cron/archive.php
+++ b/misc/cron/archive.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -37,6 +37,7 @@ if (false !== strpos($callee, 'archive.php')) {
 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.
 To get help use '/path/to/php $piwikHome/console core:archive --help'
+See also: http://piwik.org/docs/setup-auto-archiving/
 -------------------------------------------------------
 \n\n";
 }
@@ -44,8 +45,6 @@ To get help use '/path/to/php $piwikHome/console core:archive --help'
 $archiving = new Piwik\CronArchive();
 try {
     $archiving->main();
-} catch (Piwik\CronArchiveFatalException $ex) {
-    $ex->logAndExit($archiving);
 } catch (Exception $e) {
-    $archiving->logFatalExceptionAndExit($e);
+    $archiving->logFatalError($e->getMessage());
 }