apply patch matomo-org/matomo#15337

matomo-org · Jan 1, 2020 · 1032eea · 1032eea
1 parent cea95ef
commit 1032eea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/app/core/Tracker/Model.php b/app/core/Tracker/Model.php
@@ -366,7 +366,7 @@ public function updateAction($idLinkVa, $valuesToUpdate)
         return $wasInserted;
     }
 
-    public function findVisitor($idSite, $configId, $idVisitor, $fieldsToRead, $shouldMatchOneFieldOnly, $isVisitorIdToLookup, $timeLookBack, $timeLookAhead)
+    public function findVisitor($idSite, $configId, $idVisitor, $userId, $fieldsToRead, $shouldMatchOneFieldOnly, $isVisitorIdToLookup, $timeLookBack, $timeLookAhead)
     {
         $selectCustomVariables = '';
 
@@ -398,12 +398,22 @@ public function findVisitor($idSite, $configId, $idVisitor, $fieldsToRead, $shou
         } elseif ($shouldMatchOneFieldOnly) {
             $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $configIdWhere, $configIdbindSql);
         } else {
-            $visitRow = $this->findVisitorByVisitorId($idVisitor, $select, $from, $visitorIdWhere, $visitorIdbindSql);
-
-            if (empty($visitRow)) {
-                $configIdWhere .= ' AND user_id IS NULL ';
-                $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $configIdWhere, $configIdbindSql);
-            }
+	        if (!empty($idVisitor)) {
+		        $visitRow = $this->findVisitorByVisitorId($idVisitor, $select, $from, $visitorIdWhere, $visitorIdbindSql);
+	        } else {
+		        $visitRow = false;
+	        }
+
+	        if (empty($visitRow)) {
+		        $configIdWhere .= ' AND ( user_id IS NULL ';
+		        if (!empty($userId)) {
+			        $configIdWhere .= 'OR user_id = ? )';
+			        $configIdbindSql[] = $userId;
+		        } else {
+			        $configIdWhere .= ')';
+		        }
+		        $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $configIdWhere, $configIdbindSql);
+	        }
         }
 
         return $visitRow;

diff --git a/app/core/Tracker/VisitorRecognizer.php b/app/core/Tracker/VisitorRecognizer.php
@@ -83,6 +83,7 @@ public function findKnownVisitor($configId, VisitProperties $visitProperties, Re
     {
         $idSite    = $request->getIdSite();
         $idVisitor = $request->getVisitorId();
+	    $userId = $request->getForcedUserId();
 
         $isVisitorIdToLookup = !empty($idVisitor);
 
@@ -98,7 +99,7 @@ public function findKnownVisitor($configId, VisitProperties $visitProperties, Re
         $shouldMatchOneFieldOnly  = $this->shouldLookupOneVisitorFieldOnly($isVisitorIdToLookup, $request);
         list($timeLookBack, $timeLookAhead) = $this->getWindowLookupThisVisit($request);
 
-        $visitRow = $this->model->findVisitor($idSite, $configId, $idVisitor, $persistedVisitAttributes, $shouldMatchOneFieldOnly, $isVisitorIdToLookup, $timeLookBack, $timeLookAhead);
+        $visitRow = $this->model->findVisitor($idSite, $configId, $idVisitor, $userId, $persistedVisitAttributes, $shouldMatchOneFieldOnly, $isVisitorIdToLookup, $timeLookBack, $timeLookAhead);
         $this->visitRow = $visitRow;
 
         if ($visitRow