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:
authordiosmosis <benaka@piwik.pro>2015-10-04 13:42:13 +0300
committerdiosmosis <benaka@piwik.pro>2015-10-04 13:44:43 +0300
commit390f2b1bb884a5b09f01fccd59a36e3093f84dd2 (patch)
treeabe2a2b20c3217bdac1b8c9c5a1e760a4cc2f3cd /plugins/CoreHome/angularjs/history
parente92991856cb7fee4280749ee5d631c2f7495a16d (diff)
Regression: columns query parameter is never urldecoded in PHP so it cannot be encoded in JS.
Diffstat (limited to 'plugins/CoreHome/angularjs/history')
-rw-r--r--plugins/CoreHome/angularjs/history/history.service.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/CoreHome/angularjs/history/history.service.js b/plugins/CoreHome/angularjs/history/history.service.js
index bcaaa6a598..8b4fac7044 100644
--- a/plugins/CoreHome/angularjs/history/history.service.js
+++ b/plugins/CoreHome/angularjs/history/history.service.js
@@ -67,7 +67,12 @@
searchObject[name] = searchObject[name][searchObject[name].length - 1];
}
- searchString.push(name + '=' + encodeURIComponent(searchObject[name]));
+ var value = searchObject[name];
+ if (name != 'columns') { // the columns query parameter is not urldecoded in PHP code. TODO: this should be fixed in 3.0
+ value = encodeURIComponent(value);
+ }
+
+ searchString.push(name + '=' + value);
}
searchString = searchString.join('&');