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:
authormattab <matthieu.aubry@gmail.com>2013-05-12 11:50:29 +0400
committermattab <matthieu.aubry@gmail.com>2013-05-12 11:50:29 +0400
commit95574945fdc0b24ff48d46d7b21ed7cadb4b4fd6 (patch)
tree849e96342bd8636f452711154a564751834d30e2
parentd89a08b8b27ef9a7293e9f8cf351bedbd838e2cb (diff)
Fixing couple more bugs (with date ranges & anotations, and bulk requests)
-rw-r--r--plugins/API/API.php2
-rw-r--r--themes/default/ajaxHelper.js5
2 files changed, 6 insertions, 1 deletions
diff --git a/plugins/API/API.php b/plugins/API/API.php
index 2402b515fd..76abc6498f 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -1615,7 +1615,7 @@ class Piwik_API_API
return array();
}
- $urls = Piwik_Common::unsanitizeInputValues($urls);
+ $urls = array_map('urldecode', $urls);
$result = array();
foreach ($urls as $url) {
diff --git a/themes/default/ajaxHelper.js b/themes/default/ajaxHelper.js
index 10b9459216..48397fa33a 100644
--- a/themes/default/ajaxHelper.js
+++ b/themes/default/ajaxHelper.js
@@ -303,11 +303,16 @@ function ajaxHelper() {
var parameters = this._mixinDefaultGetParams(this.getParams);
var url = 'index.php?';
+
// we took care of encoding &segment properly already, so we don't use $.param for it ($.param URL encodes the values)
if(parameters['segment']) {
url += 'segment=' + parameters['segment'] + '&';
delete parameters['segment'];
}
+ if(parameters['date']) {
+ url += 'date=' + decodeURIComponent(parameters['date']) + '&';
+ delete parameters['date'];
+ }
url += $.param(parameters);
var ajaxCall = {
type: 'POST',