Fix build (use correct max last date value in archive.php cron script for week periods).

misc/cron/archive.php

@@ -163,16 +163,14 @@ class Archiving
      */
     private function getVisitsRequestUrl($idsite, $period, $lastTimestampWebsiteProcessed = false)
     {
+        $dateLastMax = $period == 'week' ? self::DEFAULT_DATE_LAST_WEEKS : self::DEFAULT_DATE_LAST;
         if (empty($lastTimestampWebsiteProcessed)) {
-            $dateLast = self::DEFAULT_DATE_LAST;
-            if ($period == 'week') {
-                $dateLast = self::DEFAULT_DATE_LAST_WEEKS;
-            }
+            $dateLast = $dateLastMax;
         } else {
             // Enforcing last2 at minimum to work around timing issues and ensure we make most archives available
             $dateLast = floor((time() - $lastTimestampWebsiteProcessed) / 86400) + 2;
-            if ($dateLast > self::DEFAULT_DATE_LAST) {
-                $dateLast = self::DEFAULT_DATE_LAST;
+            if ($dateLast > $dateLastMax) {
+                $dateLast = $dateLastMax;
             }
         }
         return "?module=API&method=VisitsSummary.getVisits&idSite=$idsite&period=$period&date=last" . $dateLast . "&format=php&token_auth=" . $this->token_auth;

plugins/VisitsSummary/API.php

@@ -36,7 +36,7 @@ class Piwik_VisitsSummary_API
     {
         Piwik::checkUserHasViewAccess($idSite);
         $archive = Archive::build($idSite, $period, $date, $segment);
-
+        
         // array values are comma separated
         $columns = Piwik::getArrayFromApiParameter($columns);
         $tempColumns = array();

tests/PHPUnit/Integration/ArchiveCronTest.php

@@ -130,4 +130,4 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase
 }
 
 Test_Piwik_Integration_ArchiveCronTest::$fixture = new Test_Piwik_Fixture_ManySitesImportedLogs();
-Test_Piwik_Integration_ArchiveCronTest::$fixture->addSegments = true;
+Test_Piwik_Integration_ArchiveCronTest::$fixture->addSegments = true;
\ No newline at end of file