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:
-rw-r--r--plugins/Live/Controller.php2
-rw-r--r--plugins/UserCountryMap/Controller.php8
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index 16c0e6b6a3..dd4ee328b6 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -204,7 +204,7 @@ class Controller extends \Piwik\Controller
if ($cached === null) {
$segment = Request::getRawSegmentFromRequest();
if (!empty($segment)) {
- $segment .= ';';
+ $segment = urldecode($segment) . ';';
}
$idVisitor = Common::getRequestVar('idVisitor', false);
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);