Clean up some additions in this branch, rename setHeartBeatTimer to enableHeartBeatTimer, rename clearHeartBeat to disableHeartBeatTimer, make sure the timer will be set up after any tracker request, not just page view.

1 files changed, 6 insertions, 8 deletions

diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 6a33b93f52..3811e81c9b 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -158,14 +158,6 @@ class Visit implements VisitInterface
 
         $isNewVisit = $this->isVisitNew($visitor, $action);
 
-        // on a ping request that is received before the standard visit length, we just update the visit time w/o
-        // adding a new action
-        if ($this->isPingRequest()
-            && !$isNewVisit
-        ) {
-            $action = null;
-        }
-
         // Known visit when:
         // ( - the visitor has the Piwik cookie with the idcookie ID used by Piwik to match the visitor
         //   OR
@@ -174,6 +166,12 @@ class Visit implements VisitInterface
         // AND
         // - the last page view for this visitor was less than 30 minutes ago @see isLastActionInTheSameVisit()
         if (!$isNewVisit) {
+            // on a ping request that is received before the standard visit length, we just update the visit time w/o
+            // adding a new action
+            if ($this->isPingRequest()) {
+                $action = null;
+            }
+
             $idReferrerActionUrl  = $this->visitorInfo['visit_exit_idaction_url'];
             $idReferrerActionName = $this->visitorInfo['visit_exit_idaction_name'];