diff options
author | Benaka <diosmosis@users.noreply.github.com> | 2015-10-04 14:23:36 +0300 |
---|---|---|
committer | Benaka <diosmosis@users.noreply.github.com> | 2015-10-04 14:23:36 +0300 |
commit | a1841865d80652975acd9cac242bf7252e3e0abe (patch) | |
tree | 245ff5fdd7255eef728d9f3c8484fddfee6f7baa /plugins/CoreHome/angularjs/history | |
parent | a30d6ae6b782dcce8cab7e2d153a06aceeb0cdfe (diff) | |
parent | 390f2b1bb884a5b09f01fccd59a36e3093f84dd2 (diff) |
Merge pull request #8905 from piwik/columns_param_regression
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.js | 7 |
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 c95a15322c..2c6486a517 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('&'); |