Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-07-10 23:43:55 +0400
committermattab <matthieu.aubry@gmail.com>2014-07-10 23:43:55 +0400
commit5855f6f89a79a1cbdb0b1262e2f1460e5d70b9f5 (patch)
tree74f4b481dfd86ecf2351ed2db8e50973400568bb /core/CronArchive.php
parent7cb9ea91e46412aa816dd658e7221ef8c0bfa6a5 (diff)
--force-periods will respect the config setting "Periods enabled in API" enabled_periods_API
Diffstat (limited to 'core/CronArchive.php')
-rw-r--r--core/CronArchive.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/CronArchive.php b/core/CronArchive.php
index 7ca9389f85..86d5bd4cff 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -12,6 +12,7 @@ use Exception;
use Piwik\ArchiveProcessor\Rules;
use Piwik\CronArchive\FixedSiteIds;
use Piwik\CronArchive\SharedSiteIds;
+use Piwik\Period\Factory;
use Piwik\Plugins\CoreAdminHome\API as APICoreAdminHome;
use Piwik\Plugins\SitesManager\API as APISitesManager;
@@ -1256,6 +1257,7 @@ class CronArchive
$restrictToPeriods = explode(',', $restrictToPeriods);
$restrictToPeriods = array_map('trim', $restrictToPeriods);
$restrictToPeriods = array_intersect($restrictToPeriods, $this->getDefaultPeriodsToProcess());
+ $restrictToPeriods = array_intersect($restrictToPeriods, Factory::getPeriodsEnabledForAPI());
return $restrictToPeriods;
}