diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-10-01 23:12:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 23:12:31 +0300 |
| commit | 82186597b37e255a5b13f6b9c7e53d323b2c501b (patch) | |
| tree | 5f30ed30c5cd63d6451280e7a6b8081245be6316 /config/global.php | |
| parent | 13cda22af49f616d1e5967364a041215f864d0c5 (diff) | |
Rename login_whitelist_ip config to login_allowlist_ip (#16413)
Diffstat (limited to 'config/global.php')
| -rw-r--r-- | config/global.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/global.php b/config/global.php index bd51022f7f..3d3f9c195f 100644 --- a/config/global.php +++ b/config/global.php @@ -146,13 +146,16 @@ return array( 'Piwik\EventDispatcher' => DI\autowire()->constructorParameter('observers', DI\get('observers.global')), - 'login.whitelist.ips' => function (ContainerInterface $c) { + 'login.allowlist.ips' => function (ContainerInterface $c) { /** @var Piwik\Config\ $config */ $config = $c->get('Piwik\Config'); $general = $config->General; $ips = array(); - if (!empty($general['login_whitelist_ip']) && is_array($general['login_whitelist_ip'])) { + if (!empty($general['login_allowlist_ip']) && is_array($general['login_allowlist_ip'])) { + $ips = $general['login_allowlist_ip']; + } elseif (!empty($general['login_whitelist_ip']) && is_array($general['login_whitelist_ip'])) { + // for BC $ips = $general['login_whitelist_ip']; } |