diff options
| author | Benaka <diosmosis@users.noreply.github.com> | 2015-09-23 06:30:07 +0300 |
|---|---|---|
| committer | Benaka <diosmosis@users.noreply.github.com> | 2015-09-23 06:30:07 +0300 |
| commit | 4fc5536042c4d75eb94c12f8f01356f070a51185 (patch) | |
| tree | c10b8d4f88d3c85b3316f162b7a40ba1b197f217 | |
| parent | ae9b27643a2411f94dc5c7dc6f09834c6d68b16d (diff) | |
| parent | 5e8a5c491e4ef234d5ba93a5a392e8033a6465d4 (diff) | |
Merge pull request #8843 from piwik/piwik_api_decode_segment
Make sure segment value is decoded before sending in HTTP request through angular
| -rw-r--r-- | plugins/CoreHome/angularjs/common/services/piwik-api.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/CoreHome/angularjs/common/services/piwik-api.js b/plugins/CoreHome/angularjs/common/services/piwik-api.js index eaf2225815..0b708a1c22 100644 --- a/plugins/CoreHome/angularjs/common/services/piwik-api.js +++ b/plugins/CoreHome/angularjs/common/services/piwik-api.js @@ -170,11 +170,16 @@ * @private */ function _mixinDefaultGetParams (getParamsToMixin) { + var segment = piwik.broadcast.getValueFromHash('segment', $window.location.href.split('#')[1]); + + // we have to decode the value manually because broadcast will not decode anything itself. if we don't, + // angular will encode it again before sending the value in an HTTP request. + segment = decodeURIComponent(segment); var defaultParams = { idSite: piwik.idSite || piwik.broadcast.getValueFromUrl('idSite'), period: piwik.period || piwik.broadcast.getValueFromUrl('period'), - segment: piwik.broadcast.getValueFromHash('segment', $window.location.href.split('#')[1]) + segment: segment }; // never append token_auth to url |