Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2013-05-24 15:23:17 +0400
committermattab <matthieu.aubry@gmail.com>2013-05-24 15:23:17 +0400
commit58c88c1b2980ee1c02a47cb3d35de1480402e6ac (patch)
treeb77a766fece69ee3888c4003799483da687b2619 /libs
parent4f4d377876adcf698c00ca2141f9cff26bf75a83 (diff)
Refs #3612
* making tests pass! * enabling DevicesDetection tests, even though DevicesDetection plugin is disabled by default.
Diffstat (limited to 'libs')
-rw-r--r--libs/UserAgentParser/UserAgentParser.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/libs/UserAgentParser/UserAgentParser.php b/libs/UserAgentParser/UserAgentParser.php
index c65ed056f6..85c9225cc5 100644
--- a/libs/UserAgentParser/UserAgentParser.php
+++ b/libs/UserAgentParser/UserAgentParser.php
@@ -653,6 +653,11 @@ class UserAgentParser
if (isset(self::$browserIdToName[$browserId])) {
return self::$browserIdToName[$browserId];
}
+ if(class_exists('UserAgentParserEnhanced')) {
+ if( !empty(UserAgentParserEnhanced::$browsers[$browserId])) {
+ return UserAgentParserEnhanced::$browsers[$browserId];
+ }
+ }
return false;
}
@@ -684,6 +689,10 @@ class UserAgentParser
if (isset(self::$operatingSystemsIdToName[$osId])) {
return self::$operatingSystemsIdToName[$osId];
}
+
+ if(class_exists('UserAgentParserEnhanced')) {
+ return UserAgentParserEnhanced::getOsNameFromId($osId);
+ }
return false;
}