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-09-01 17:33:07 +0400
committermattab <matthieu.aubry@gmail.com>2014-09-01 17:33:07 +0400
commitd903c1f0be860bae5e48031baa6d0512a917dcbb (patch)
tree584f9135f4497d2ad0b8f6286594fcf657208b9d /core/Tracker/Visitor.php
parentdc48c3132757a6125203368207d71ac1fd32cc0f (diff)
Refs #3490 User ID Tracker is now working:
- new user_id field to contain the raw user id value - new &uid= tracker api parameter - add userId to Live API output - added integration test
Diffstat (limited to 'core/Tracker/Visitor.php')
-rw-r--r--core/Tracker/Visitor.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/Tracker/Visitor.php b/core/Tracker/Visitor.php
index 70fb165f9b..3cc2275853 100644
--- a/core/Tracker/Visitor.php
+++ b/core/Tracker/Visitor.php
@@ -236,8 +236,12 @@ class Visitor
// If a &cid= was set, we force to select this visitor (or create a new one)
$isForcedVisitorIdMustMatch = ($this->request->getForcedVisitorId() != null);
+ // if &iud was set, we force to select this visitor (or create new one)
+ $isForcedUserIdMustMatch = ($this->request->getForcedUserId() != null);
+
$shouldMatchOneFieldOnly = (($isVisitorIdToLookup && $trustCookiesOnly)
|| $isForcedVisitorIdMustMatch
+ || $isForcedUserIdMustMatch
|| !$isVisitorIdToLookup);
return $shouldMatchOneFieldOnly;
}
@@ -250,6 +254,8 @@ class Visitor
$fields = array(
'idvisitor',
'idvisit',
+ 'user_id',
+
'visit_exit_idaction_url',
'visit_exit_idaction_name',
'visitor_returning',