diff options
author | diosmosis <benaka@piwik.pro> | 2015-10-29 23:35:37 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2015-10-29 23:35:37 +0300 |
commit | 798fcf1b79a427881401a0da63f4e52ad559b64e (patch) | |
tree | ecb5c4c9eb50b53e9063ce0966aa2ec7b8bc2e80 /config/environment | |
parent | 0199c3be722e71cbd7215acb709e5db2b4deb007 (diff) |
Rename whitelist to blacklist since we're ignoring entries that are in the list, not running code only for those entries.
Diffstat (limited to 'config/environment')
-rw-r--r-- | config/environment/ui-test.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/config/environment/ui-test.php b/config/environment/ui-test.php index e7d82534bb..de2d549f06 100644 --- a/config/environment/ui-test.php +++ b/config/environment/ui-test.php @@ -6,9 +6,9 @@ return array( // UI tests will remove the port from all URLs to the test server. if a test // requires the ports in UI tests (eg, Overlay), add the api/controller methods - // to one of these whitelists - 'tests.ui.url_normalizer_whitelist.api' => array(), - 'tests.ui.url_normalizer_whitelist.controller' => array(), + // to one of these blacklists + 'tests.ui.url_normalizer_blacklist.api' => array(), + 'tests.ui.url_normalizer_blacklist.controller' => array(), 'Piwik\Config' => \DI\decorate(function (\Piwik\Config $config) { $config->General['cors_domains'][] = '*'; @@ -24,19 +24,19 @@ return array( array('Request.dispatch.end', function (&$result) { $request = $_GET + $_POST; - $apiWhitelist = StaticContainer::get('tests.ui.url_normalizer_whitelist.api'); + $apiblacklist = StaticContainer::get('tests.ui.url_normalizer_blacklist.api'); if (!empty($request['method']) - && in_array($request['method'], $apiWhitelist) + && in_array($request['method'], $apiblacklist) ) { return; } - $controllerActionWhitelist = StaticContainer::get('tests.ui.url_normalizer_whitelist.controller'); + $controllerActionblacklist = StaticContainer::get('tests.ui.url_normalizer_blacklist.controller'); if (!empty($request['module']) && !empty($request['action']) ) { $controllerAction = $request['module'] . '.' . $request['action']; - if (in_array($controllerAction, $controllerActionWhitelist)) { + if (in_array($controllerAction, $controllerActionblacklist)) { return; } } |