From e0417845f8fd7031e00e97c3576415c998abb2ce Mon Sep 17 00:00:00 2001 From: dizzy Date: Sun, 30 May 2021 17:57:53 -0700 Subject: Allow overriding some Tracker config by idSite (#17636) * Allow tracker config to be customized per site (for some configs) * Update Response.php * allow few more settings to be overwritten on a per site basis * idsite parameter may not be specified during Tracker\Request::__construct() (eg, during bulk tracking) * Fix another test. * Just make idsite optional for TrackerConfig::getConfigValue() calls. * try to fix remaining failure * forgot to add test file Co-authored-by: Thomas Steur --- plugins/CoreHome/Tracker/VisitRequestProcessor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/CoreHome/Tracker') diff --git a/plugins/CoreHome/Tracker/VisitRequestProcessor.php b/plugins/CoreHome/Tracker/VisitRequestProcessor.php index 1f4706f859..65906cd45e 100644 --- a/plugins/CoreHome/Tracker/VisitRequestProcessor.php +++ b/plugins/CoreHome/Tracker/VisitRequestProcessor.php @@ -184,7 +184,7 @@ class VisitRequestProcessor extends RequestProcessor } $wasLastActionYesterday = $this->wasLastActionNotToday($visitProperties, $request, $lastKnownVisit); - $forceNewVisitAtMidnight = (bool) Config::getInstance()->Tracker['create_new_visit_after_midnight']; + $forceNewVisitAtMidnight = (bool) TrackerConfig::getConfigValue('create_new_visit_after_midnight', $request->getIdSiteIfExists()); if ($wasLastActionYesterday && $forceNewVisitAtMidnight) { Common::printDebug("Visitor detected, but last action was yesterday..."); @@ -192,7 +192,7 @@ class VisitRequestProcessor extends RequestProcessor return true; } - if (!TrackerConfig::getConfigValue('enable_userid_overwrites_visitorid') + if (!TrackerConfig::getConfigValue('enable_userid_overwrites_visitorid', $request->getIdSiteIfExists()) && !$this->lastUserIdWasSetAndDoesMatch($visitProperties, $request)) { Common::printDebug("Visitor detected, but last user_id does not match..."); return true; -- cgit v1.2.3