aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorRubén Calvo <rubencm@gmail.com>2018-09-01 01:16:57 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-05-09 19:04:01 +0200
commit303b823847d23edf381203bddb7af58a3ad68173 (patch)
treebf50c0e226af80dee8f8f91bdb602dabc8c4d3c3 /phpBB/phpbb
parent4f402465bf41c88876a499cacfc6bdc1762dfe44 (diff)
downloadforums-303b823847d23edf381203bddb7af58a3ad68173.tar
forums-303b823847d23edf381203bddb7af58a3ad68173.tar.gz
forums-303b823847d23edf381203bddb7af58a3ad68173.tar.bz2
forums-303b823847d23edf381203bddb7af58a3ad68173.tar.xz
forums-303b823847d23edf381203bddb7af58a3ad68173.zip
[ticket/12636] Add log.session_errors
PHPBB3-12636
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/di/extension/container_configuration.php6
-rw-r--r--phpBB/phpbb/di/extension/core.php6
-rw-r--r--phpBB/phpbb/session.php2
3 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
index c64f47c716..25e0f8a193 100644
--- a/phpBB/phpbb/di/extension/container_configuration.php
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -49,6 +49,12 @@ class container_configuration implements ConfigurationInterface
->booleanNode('enable_debug_extension')->defaultValue(false)->end()
->end()
->end()
+ ->arrayNode('log')
+ ->addDefaultsIfNotSet()
+ ->children()
+ ->booleanNode('session_errors')->defaultValue(false)->end()
+ ->end()
+ ->end()
->end()
;
return $treeBuilder;
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php
index 7b5a286b40..213e3a5890 100644
--- a/phpBB/phpbb/di/extension/core.php
+++ b/phpBB/phpbb/di/extension/core.php
@@ -99,6 +99,12 @@ class core extends Extension
{
$container->setParameter('debug.' . $name, $value);
}
+
+ // Set the log options
+ foreach ($config['log'] as $name => $value)
+ {
+ $container->setParameter('log.' . $name, $value);
+ }
}
/**
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index e5621a4ee7..719a5fb104 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 (defined('DEBUG') && $this->data['user_id'] != ANONYMOUS)
+ if ($phpbb_container->getParameter('log.session_errors') && $this->data['user_id'] != ANONYMOUS)
{
if ($referer_valid)
{