diff options
author | sgiehl <stefan@matomo.org> | 2020-07-24 14:11:05 +0300 |
---|---|---|
committer | sgiehl <stefan@matomo.org> | 2020-07-24 15:28:48 +0300 |
commit | 679e73f1236969db0c2d767655cb84456a727d24 (patch) | |
tree | 648722fa79cb524f8819857e79163e0c1cf16d59 /core/Tracker/Request.php | |
parent | 6b5f8138180716d5088d764f0b41d5787159b28a (diff) | |
parent | 3e1234a887f56a1cf853e29ba89370b234af5127 (diff) |
Merge branch '3.x-dev' into 4.x-dev
Diffstat (limited to 'core/Tracker/Request.php')
-rw-r--r-- | core/Tracker/Request.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index 57458fa000..98133e4319 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -208,7 +208,7 @@ class Request return true; } } - + Piwik::postEvent('Request.initAuthenticationObject'); /** @var \Piwik\Auth $auth */ @@ -541,7 +541,7 @@ class Request return Common::getRequestVar('ua', $default, 'string', $this->params); } - protected function shouldUseThirdPartyCookie() + public function shouldUseThirdPartyCookie() { return (bool)Config::getInstance()->Tracker['use_third_party_id_cookie']; } @@ -567,6 +567,10 @@ class Request return; } + if (\Piwik\Tracker\IgnoreCookie::isIgnoreCookieFound()) { + return; + } + $cookie = $this->makeThirdPartyCookieUID(); $idVisitor = bin2hex($idVisitor); $cookie->set(0, $idVisitor); @@ -631,7 +635,7 @@ class Request $found = false; if (TrackerConfig::getConfigValue('enable_userid_overwrites_visitorid')) { - // If User ID is set it takes precedence + // If User ID is set it takes precedence $userId = $this->getForcedUserId(); if ($userId) { $userIdHashed = $this->getUserIdHashed($userId); |