Skip to content
Extraits de code Groupes Projets
Valider 75f3a9ff rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Do not use php-di config for option since it is easier to use INI config w/o...

Do not use php-di config for option since it is easier to use INI config w/o adding documented default in global.ini.php and just handle case where config option is not defined.
parent c89d0942
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -161,5 +161,4 @@ return array(
'Piwik\Translation\Loader\LoaderInterface' => DI\object('Piwik\Translation\Loader\LoaderCache')
->constructor(DI\link('Piwik\Translation\Loader\JsonFileLoader')),
'archiving.range.force_on_browser_request' => true
);
......@@ -229,8 +229,12 @@ class Rules
public static function isArchivingDisabledFor(array $idSites, Segment $segment, $periodLabel)
{
$generalConfig = Config::getInstance()->General;
if ($periodLabel == 'range') {
if (StaticContainer::get('archiving.range.force_on_browser_request') !== false) {
if (empty($generalConfig['archiving_range_force_on_browser_request'])
|| $generalConfig['archiving_range_force_on_browser_request'] !== false
) {
return false;
} else {
Log::verbose("Not forcing archiving for range period.");
......@@ -246,7 +250,7 @@ class Rules
// When there is a segment, we disable archiving when browser_archiving_disabled_enforce applies
if (!$segment->isEmpty()
&& $isArchivingDisabled
&& Config::getInstance()->General['browser_archiving_disabled_enforce']
&& $generalConfig['browser_archiving_disabled_enforce']
&& !SettingsServer::isArchivePhpTriggered() // Only applies when we are not running core:archive command
) {
Log::debug("Archiving is disabled because of config setting browser_archiving_disabled_enforce=1");
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter