Fixes #4857

matomo-org · Mar 17, 2014 · c1f375e · c1f375e
1 parent df458d7
commit c1f375e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
@@ -241,9 +241,6 @@ public static function isArchivingDisabledFor(array $idSites, Segment $segment,
         if ($periodLabel == 'range') {
             return false;
         }
-        if( SettingsServer::isArchivePhpTriggered() ) {
-            return false;
-        }
         $processOneReportOnly = !self::shouldProcessReportsAllPlugins($idSites, $segment, $periodLabel);
         $isArchivingDisabled = !self::isRequestAuthorizedToArchive() || self::$archivingDisabledByTests;
 
@@ -253,6 +250,7 @@ public static function isArchivingDisabledFor(array $idSites, Segment $segment,
             if (!$segment->isEmpty()
                 && $isArchivingDisabled
                 && Config::getInstance()->General['browser_archiving_disabled_enforce']
+                && !SettingsServer::isArchivePhpTriggered() // Only applies when we are not running archive.php
             ) {
                 Log::debug("Archiving is disabled because of config setting browser_archiving_disabled_enforce=1");
                 return true;

diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -60,10 +60,6 @@ public function getApiForTesting()
             $results[] = array(array('VisitsSummary.get', 'Live.getLastVisitsDetails', 'VisitFrequency.get'),
                                array('idSite'     => '1',
                                      'date'       => '2012-08-09',
-
-                                     // test for this bug http://dev.piwik.org/trac/ticket/4857 (with period != range)
-                                     'disableArchivingEnforced' => true,
-
                                      'periods'    => array('day', 'year'),
                                      'segment'    => $segment,
                                      'testSuffix' => '_preArchivedSegment'));