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:
authordiosmosis <diosmosis@users.noreply.github.com>2018-10-03 08:59:54 +0300
committerGitHub <noreply@github.com>2018-10-03 08:59:54 +0300
commit67eaa2c0381933d5e38180a2159044893447acca (patch)
tree6810978ef7295aeeaeb2256b95712111cea07c96 /config/environment
parentae872e501015ec5ed5a538c23f6e090ce3089c66 (diff)
Use postMessage instead of directly making API calls in the overlay iframe. (#13446)
* Use postMessage instead of directly making API calls in the overlay iframe. * Make sure it will work when Matomo is on a subfolder. * Increase overlay security with domain and method whitelists. * Try to fix UI test. * Fix tests + UI test blacklist check. * broadcast.getValuesFromUrl does not decode URL params.
Diffstat (limited to 'config/environment')
-rw-r--r--config/environment/ui-test.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/config/environment/ui-test.php b/config/environment/ui-test.php
index 6d9235ed21..d18022689a 100644
--- a/config/environment/ui-test.php
+++ b/config/environment/ui-test.php
@@ -32,10 +32,8 @@ return array(
}
$controllerActionblacklist = StaticContainer::get('tests.ui.url_normalizer_blacklist.controller');
- if (!empty($request['module'])
- && !empty($request['action'])
- ) {
- $controllerAction = $request['module'] . '.' . $request['action'];
+ if (!empty($request['module'])) {
+ $controllerAction = $request['module'] . '.' . (isset($request['action']) ? $request['action'] : 'index');
if (in_array($controllerAction, $controllerActionblacklist)) {
return;
}