diff options
| author | rubencm <rubencm@gmail.com> | 2018-09-13 14:53:01 +0000 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-09 21:20:16 +0200 |
| commit | a702142a3483e0d80352e74d238938e6f01eaa2d (patch) | |
| tree | 0b9856ea58a33b90f1e74578366875c09ef5c640 | |
| parent | c20fed43cde6cf3c31130336bb45de860a536aae (diff) | |
| download | forums-a702142a3483e0d80352e74d238938e6f01eaa2d.tar forums-a702142a3483e0d80352e74d238938e6f01eaa2d.tar.gz forums-a702142a3483e0d80352e74d238938e6f01eaa2d.tar.bz2 forums-a702142a3483e0d80352e74d238938e6f01eaa2d.tar.xz forums-a702142a3483e0d80352e74d238938e6f01eaa2d.zip | |
[ticket/12636] Rename log.session_errors to session.log_errors
PHPBB3-12636
| -rw-r--r-- | phpBB/config/development/config.yml | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/container_configuration.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/core.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/session.php | 2 | ||||
| -rw-r--r-- | tests/mock/container_builder.php | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/config/development/config.yml b/phpBB/config/development/config.yml index 8db83320e7..76da151d50 100644 --- a/phpBB/config/development/config.yml +++ b/phpBB/config/development/config.yml @@ -16,5 +16,5 @@ core: auto_reload: true enable_debug_extension: true - log: - session_errors: true + session: + log_errors: true diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php index 25e0f8a193..131ec70c8d 100644 --- a/phpBB/phpbb/di/extension/container_configuration.php +++ b/phpBB/phpbb/di/extension/container_configuration.php @@ -49,10 +49,10 @@ class container_configuration implements ConfigurationInterface ->booleanNode('enable_debug_extension')->defaultValue(false)->end() ->end() ->end() - ->arrayNode('log') + ->arrayNode('session') ->addDefaultsIfNotSet() ->children() - ->booleanNode('session_errors')->defaultValue(false)->end() + ->booleanNode('log_errors')->defaultValue(false)->end() ->end() ->end() ->end() diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index 213e3a5890..0497c90e2a 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -101,9 +101,9 @@ class core extends Extension } // Set the log options - foreach ($config['log'] as $name => $value) + foreach ($config['session'] as $name => $value) { - $container->setParameter('log.' . $name, $value); + $container->setParameter('session.' . $name, $value); } } diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 719a5fb104..9e1548bf76 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -479,7 +479,7 @@ class session else { // Added logging temporarily to help debug bugs... - if ($phpbb_container->getParameter('log.session_errors') && $this->data['user_id'] != ANONYMOUS) + if ($phpbb_container->getParameter('session.log_errors') && $this->data['user_id'] != ANONYMOUS) { if ($referer_valid) { diff --git a/tests/mock/container_builder.php b/tests/mock/container_builder.php index b27b0e64cb..17c4ae22dd 100644 --- a/tests/mock/container_builder.php +++ b/tests/mock/container_builder.php @@ -21,7 +21,7 @@ class phpbb_mock_container_builder implements ContainerInterface public function __construct() { $this->setParameter('debug.load_time', false); - $this->setParameter('log.session_errors', false); + $this->setParameter('session.log_errors', false); } /** |