Minor

2 files changed, 19 insertions, 13 deletions

diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php
index cba622ed99..6a47669b76 100644
--- a/core/Tracker/Action.php
+++ b/core/Tracker/Action.php
@@ -743,16 +743,17 @@ class Action implements ActionInterface
             $url = '';
         }
 
-        // Site search?
         if ($actionType == self::TYPE_ACTION_URL) {
+
             // Look in tracked URL for the Site Search parameters
             $siteSearch = $this->detectSiteSearch($url);
             if (!empty($siteSearch)) {
                 $actionType = self::TYPE_SITE_SEARCH;
                 list($actionName, $url) = $siteSearch;
             }
+
             // Look for performance analytics parameters
-            $this->detectPerformanceAnalyticsParameters();
+            $this->timeGeneration = $this->request->getPageGenerationTime();
         }
         $actionName = self::cleanupString($actionName);
 
@@ -918,17 +919,6 @@ class Action implements ActionInterface
         return array($url, $actionName, $categoryName, $count);
     }
 
-    const GENERATION_TIME_MS_MAXIMUM = 3600000; // 1 hour
-    protected function detectPerformanceAnalyticsParameters()
-    {
-        $generationTime = $this->request->getParam('gt_ms');
-        if ($generationTime > 0
-            && $generationTime < self::GENERATION_TIME_MS_MAXIMUM
-        ) {
-            $this->timeGeneration = (int)$generationTime;
-        }
-    }
-
     /**
      * Clean up string contents (filter, truncate, ...)
      *
diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php
index 8a7218979f..a26a9f1f79 100644
--- a/core/Tracker/Request.php
+++ b/core/Tracker/Request.php
@@ -527,4 +527,20 @@ class Request
     {
         return count($this->params);
     }
+
+
+    const GENERATION_TIME_MS_MAXIMUM = 3600000; // 1 hour
+
+    public function getPageGenerationTime()
+    {
+        $generationTime = $this->getParam('gt_ms');
+        if ($generationTime > 0
+            && $generationTime < self::GENERATION_TIME_MS_MAXIMUM
+        ) {
+            return (int)$generationTime;
+        }
+        return false;
+    }
+
+
 }