When script is called from misc/cron/archive.php, still return correct Piwik URL

core/SettingsPiwik.php

@@ -179,6 +179,9 @@ class SettingsPiwik
 
         $currentUrl = Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName());
 
+        // when script is called from /misc/cron/archive.php, Piwik URL is /index.php
+        $currentUrl = str_replace("/misc/cron/", "", $currentUrl);
+
         if (empty($url)
             // if URL changes, always update the cache
             || $currentUrl != $url

tests/PHPUnit/System/ArchiveWebTest.php

@@ -74,7 +74,7 @@ class ArchiveWebTest extends SystemTestCase
         $this->assertNotContains('WARNING', $output);
 
         // Check there are enough lines in output
-        $minimumLinesInOutput = 60;
+        $minimumLinesInOutput = 30;
         $linesInOutput = count( explode(PHP_EOL, $output) );
         $this->assertGreaterThan($minimumLinesInOutput, $linesInOutput);
     }