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:
authordizzy <diosmosis@users.noreply.github.com>2021-05-31 03:57:53 +0300
committerGitHub <noreply@github.com>2021-05-31 03:57:53 +0300
commite0417845f8fd7031e00e97c3576415c998abb2ce (patch)
treebcb32121d164b62229209534538f8ca7c2bf6705 /plugins/CoreHome/Tracker
parent30eec9445b0a2117f80305f7a367121039f04817 (diff)
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 <tsteur@users.noreply.github.com>
Diffstat (limited to 'plugins/CoreHome/Tracker')
-rw-r--r--plugins/CoreHome/Tracker/VisitRequestProcessor.php4
1 files changed, 2 insertions, 2 deletions
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;