Applying review changes: remove tracker_ prefix from config names, move shouldForceNewVisit to VisitDimension and simplify triggerPredicateHookOnDimensions.

1 files changed, 4 insertions, 11 deletions

diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 2530dc774b..4e108450b5 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -542,21 +542,14 @@ class Visit implements VisitInterface
         return $valuesToUpdate;
     }
 
-    private function triggerPredicateHookOnDimensions($dimensions, $hook, Visitor $visitor, Action $action = null, $returnFirstTrue = true)
+    private function triggerPredicateHookOnDimensions($dimensions, $hook, Visitor $visitor, Action $action = null)
     {
-        $result = $returnFirstTrue ? false : array();
         foreach ($dimensions as $dimension) {
-            $value = $dimension->$hook($this->request, $visitor, $action);
-
-            if ($returnFirstTrue) {
-                if ($value) {
-                    return true;
-                }
-            } else {
-                $result[] = $value;
+            if ($dimension->$hook($this->request, $visitor, $action)) {
+                return true;
             }
         }
-        return $result;
+        return false;
     }
 
     protected function getAllVisitDimensions()