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>2015-06-23 07:30:34 +0300
committermattab <matthieu.aubry@gmail.com>2015-06-23 07:30:34 +0300
commit0ebd9e2e6b76060a7a28de264f4a306cc0236faa (patch)
treeab8997610eaa80b58307003ae12633cd7606400a /plugins/CoreHome/javascripts/broadcast.js
parent16b33927ef545c4b7e66d9761b89d8f0a75784d0 (diff)
Disallow displaying API content within Piwik app
+ regression test + regression test for #7638
Diffstat (limited to 'plugins/CoreHome/javascripts/broadcast.js')
-rw-r--r--plugins/CoreHome/javascripts/broadcast.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js
index 5ada120a6b..51b2a8a64d 100644
--- a/plugins/CoreHome/javascripts/broadcast.js
+++ b/plugins/CoreHome/javascripts/broadcast.js
@@ -416,6 +416,13 @@ var broadcast = {
);
}
+ if(broadcast.getParamValue('module', urlAjax) == 'API') {
+ broadcast.lastUrlRequested = null;
+ $('#content').html("Loading content from the API and displaying it within Piwik is not allowed.");
+ piwikHelper.hideAjaxLoading();
+ return false;
+ }
+
piwikHelper.hideAjaxError('loadingError');
piwikHelper.showAjaxLoading();
$('#content').empty();