introduce devicedetector factory to get singleton instances of devicedetector based on the given user agent. That provides the possibility to reuse DeviceDetector for bot and visitor data detection.

1 files changed, 2 insertions, 12 deletions

diff --git a/core/Tracker/Settings.php b/core/Tracker/Settings.php
index 65bb17fb94..08d4341d20 100644
--- a/core/Tracker/Settings.php
+++ b/core/Tracker/Settings.php
@@ -9,6 +9,7 @@
 namespace Piwik\Tracker;
 
 use Piwik\DeviceDetectorCache;
+use Piwik\DeviceDetectorFactory;
 use Piwik\Tracker;
 use DeviceDetector\DeviceDetector;
 
@@ -37,18 +38,7 @@ class Settings
         $resolution = $this->request->getParam('res');
         $userAgent = $this->request->getUserAgent();
 
-        static $deviceDetectorsCache = array();
-        if (array_key_exists($userAgent, $deviceDetectorsCache)) {
-            $deviceDetector = $deviceDetectorsCache[$userAgent];
-        }
-        else {
-            $deviceDetector = new DeviceDetector($userAgent);
-            $deviceDetector->discardBotInformation();
-            $deviceDetector->setCache(new DeviceDetectorCache('tracker', 86400));
-            $deviceDetector->parse();
-
-            $deviceDetectorsCache[$userAgent] = $deviceDetector;
-        }
+        $deviceDetector = DeviceDetectorFactory::getInstance($userAgent);
 
         $aBrowserInfo = $deviceDetector->getClient();
         if ($aBrowserInfo['type'] != 'browser') {