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
diff options
context:
space:
mode:
authorsgiehl <stefan@piwik.org>2014-11-24 01:38:37 +0300
committersgiehl <stefan@piwik.org>2014-11-24 01:38:37 +0300
commite2ce5cd0bc284f9cef6d337d6689b3d88c72e7e5 (patch)
tree3ffeaf60415714acc365bbeafc834f3fae52a355 /plugins
parentf0cb16991ab28bb0a88a6a5f9e8534bb52778fff (diff)
a visitor now has a browser, browser name and browser version attribute, so it's clear what it's containing.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/DevicesDetection/DevicesDetection.php3
-rw-r--r--plugins/DevicesDetection/Visitor.php5
2 files changed, 7 insertions, 1 deletions
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 59296b2fc5..312bca614f 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -54,7 +54,8 @@ class DevicesDetection extends \Piwik\Plugin
$visitor['operatingSystemIcon'] = $instance->getOperatingSystemIcon();
$visitor['browserFamily'] = $instance->getBrowserEngine();
$visitor['browserFamilyDescription'] = $instance->getBrowserEngineDescription();
- $visitor['browserName'] = $instance->getBrowser();
+ $visitor['browser'] = $instance->getBrowser();
+ $visitor['browserName'] = $instance->getBrowserName();
$visitor['browserIcon'] = $instance->getBrowserIcon();
$visitor['browserCode'] = $instance->getBrowserCode();
$visitor['browserVersion'] = $instance->getBrowserVersion();
diff --git a/plugins/DevicesDetection/Visitor.php b/plugins/DevicesDetection/Visitor.php
index a75c0c6b0d..aa5b16c2ae 100644
--- a/plugins/DevicesDetection/Visitor.php
+++ b/plugins/DevicesDetection/Visitor.php
@@ -61,6 +61,11 @@ class Visitor
public function getBrowser()
{
+ return getBrowserNameWithVersion($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']);
+ }
+
+ public function getBrowserName()
+ {
return getBrowserName($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']);
}