diff options
| author | robocoder <anthon.pang@gmail.com> | 2011-09-24 21:08:19 +0400 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2011-09-24 21:08:19 +0400 |
| commit | 54e0b6c3ee842764ae3dcb9949860ac4111edc88 (patch) | |
| tree | 94d4e62d2e48ff1b60b340d57ffbcdfa758044ef | |
| parent | b6a6bbc28cf3280856b3b6c948fad88f29c7183f (diff) | |
fixes #2679 - use de facto standard "callback" for the JSONP callback parameter name
git-svn-id: http://dev.piwik.org/svn/trunk@5216 59fd770c-687e-43c8-a1e3-f5a4ff64c105
| -rw-r--r-- | core/DataTable/Renderer/Json.php | 2 | ||||
| -rw-r--r-- | plugins/ExamplePlugin/templates/piwikDownloads.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/DataTable/Renderer/Json.php b/core/DataTable/Renderer/Json.php index 5fc1e3ec08..8b43b83a37 100644 --- a/core/DataTable/Renderer/Json.php +++ b/core/DataTable/Renderer/Json.php @@ -61,7 +61,7 @@ class Piwik_DataTable_Renderer_Json extends Piwik_DataTable_Renderer protected function jsonpWrap($str) { - if(($jsonCallback = Piwik_Common::getRequestVar('jsoncallback', false)) !== false) + if(($jsonCallback = Piwik_Common::getRequestVar('callback', false)) !== false) { if(preg_match('/^[0-9a-zA-Z_]*$/', $jsonCallback) > 0) { diff --git a/plugins/ExamplePlugin/templates/piwikDownloads.tpl b/plugins/ExamplePlugin/templates/piwikDownloads.tpl index 30cb40c446..910a81f213 100644 --- a/plugins/ExamplePlugin/templates/piwikDownloads.tpl +++ b/plugins/ExamplePlugin/templates/piwikDownloads.tpl @@ -11,7 +11,7 @@ +"&idSite=7&period="+piwik.period+"&date="+broadcast.getValueFromUrl('date') +"&token_auth=anonymous&format=json", dataType: 'jsonp', - jsonp: 'jsoncallback', + jsonp: 'callback', success: function(data) { $('.piwikDownloadCount_cnt').html(data.value); } |