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:
authorBenaka Moorthi <benaka.moorthi@gmail.com>2013-09-09 00:13:51 +0400
committerBenaka Moorthi <benaka.moorthi@gmail.com>2013-09-09 00:41:34 +0400
commit1fe27677578867f04989be391059e505b3afc651 (patch)
treee05c7e1d6bcc23d35bd00f576a8855fb79794d3b /plugins/UserCountryMap
parent046502f876999afcc5e46e80c6698f0d6409881a (diff)
Refs #3089, fix double encoded segment bug in visitor profile & UserCountryMap & make sure segment override is used by UserCountryMap.
Diffstat (limited to 'plugins/UserCountryMap')
-rw-r--r--plugins/UserCountryMap/Controller.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index 93684b9da7..539e3dadb0 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -177,9 +177,11 @@ class Controller extends \Piwik\Controller
{
$params['format'] = 'json';
$params['showRawMetrics'] = 1;
- $segment = \Piwik\API\Request::getRawSegmentFromRequest();
- if (!empty($segment)) {
- $params['segment'] = $segment;
+ if (empty($params['segment'])) {
+ $segment = \Piwik\API\Request::getRawSegmentFromRequest();
+ if (!empty($segment)) {
+ $params['segment'] = urldecode($segment);
+ }
}
return Common::json_encode($params);