diff options
author | Matthieu Aubry <matt@piwik.org> | 2014-06-17 09:35:39 +0400 |
---|---|---|
committer | Matthieu Aubry <matt@piwik.org> | 2014-06-17 09:35:39 +0400 |
commit | d4f1ce6de71ae00e2d420d0c415a75929ec0afe9 (patch) | |
tree | 610b9d5ef60b07deeca96a0606a907c8af519d97 /libs | |
parent | 3f82b4ab7b8fc82eed0303936e869f78adcf4fb3 (diff) | |
parent | 32f996a30f3b9ea4b794059c7bfd08d81ab072ea (diff) |
Merge pull request #305 from piwik/DeviceDetector2
Switch to DeviceDetector 2.X
Diffstat (limited to 'libs')
-rw-r--r-- | libs/UserAgentParser/UserAgentParser.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libs/UserAgentParser/UserAgentParser.php b/libs/UserAgentParser/UserAgentParser.php index a57554e4da..009bc5a785 100644 --- a/libs/UserAgentParser/UserAgentParser.php +++ b/libs/UserAgentParser/UserAgentParser.php @@ -655,9 +655,10 @@ class UserAgentParser if (isset(self::$browserIdToName[$browserId])) { return self::$browserIdToName[$browserId]; } - if(class_exists('DeviceDetector')) { - if( !empty(DeviceDetector::$browsers[$browserId])) { - return DeviceDetector::$browsers[$browserId]; + if(class_exists('DeviceDetector\\Parser\\Client\\Browser')) { + $browsers = DeviceDetector\Parser\Client\Browser::getAvailableBrowsers(); + if( array_key_exists($browserId, $browsers)) { + return $browsers[$browserId]; } } return false; @@ -692,8 +693,11 @@ class UserAgentParser return self::$operatingSystemsIdToName[$osId]; } - if(class_exists('DeviceDetector')) { - return DeviceDetector::getOsNameFromId($osId); + if(class_exists('DeviceDetector\\Parser\\OperatingSystem')) { + if ($osId == 'BOT') { + return 'Bot'; + } + return DeviceDetector\Parser\OperatingSystem::getNameFromId($osId); } return false; } |