aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrubencm <rubencm@gmail.com>2018-09-13 14:40:47 +0000
committerMarc Alexander <admin@m-a-styles.de>2019-05-09 21:23:58 +0200
commit6643c904d52563e26e8a92338c45f38cd5e0167f (patch)
treeee963dc8fdf761c71f9b2ce6ffd84ad6aa92ce83
parentba088f6bdc2d8dcf48f93646b13108c64124ba1d (diff)
downloadforums-6643c904d52563e26e8a92338c45f38cd5e0167f.tar
forums-6643c904d52563e26e8a92338c45f38cd5e0167f.tar.gz
forums-6643c904d52563e26e8a92338c45f38cd5e0167f.tar.bz2
forums-6643c904d52563e26e8a92338c45f38cd5e0167f.tar.xz
forums-6643c904d52563e26e8a92338c45f38cd5e0167f.zip
[ticket/12629] Rename errors_show to show_errors
PHPBB3-12629
-rw-r--r--phpBB/config/development/config.yml2
-rw-r--r--phpBB/includes/functions.php4
-rw-r--r--phpBB/phpbb/di/extension/container_configuration.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/config/development/config.yml b/phpBB/config/development/config.yml
index bce4355e3d..c782e7a45f 100644
--- a/phpBB/config/development/config.yml
+++ b/phpBB/config/development/config.yml
@@ -10,7 +10,7 @@ core:
load_time: true
sql_explain: true
memory: true
- errors_show: true
+ show_errors: true
twig:
debug: true
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 1bc4ae2ee4..c3108f6f8e 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3341,7 +3341,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
// Check the error reporting level and return if the error level does not match
// If DEBUG is defined the default level is E_ALL
- if (($errno & ($phpbb_container->getParameter('debug.errors_show') ? E_ALL : error_reporting())) == 0)
+ if (($errno & ($phpbb_container->getParameter('debug.show_errors') ? E_ALL : error_reporting())) == 0)
{
return;
}
@@ -3399,7 +3399,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
$log_text .= '<br /><br />BACKTRACE<br />' . $backtrace;
}
- if (defined('IN_INSTALL') || $phpbb_container->getParameter('debug.errors_show') || isset($auth) && $auth->acl_get('a_'))
+ if (defined('IN_INSTALL') || $phpbb_container->getParameter('debug.show_errors') || isset($auth) && $auth->acl_get('a_'))
{
$msg_text = $log_text;
diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
index 9f8cf34311..57e7ef6ca6 100644
--- a/phpBB/phpbb/di/extension/container_configuration.php
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -39,7 +39,7 @@ class container_configuration implements ConfigurationInterface
->booleanNode('load_time')->defaultValue(false)->end()
->booleanNode('sql_explain')->defaultValue(false)->end()
->booleanNode('memory')->defaultValue(false)->end()
- ->booleanNode('errors_show')->defaultValue(false)->end()
+ ->booleanNode('show_errors')->defaultValue(false)->end()
->end()
->end()
->arrayNode('twig')