aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorPaul Sohier <paul999@phpbb.com>2019-05-03 22:45:53 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-10-19 17:29:20 +0200
commit465d0b1a4c665468e188381f6e83376bfde9422a (patch)
tree12eae7fd06e0024e407ead7c6bce998000bba72e /phpBB/includes
parent6105260a8e9d329fbdb77d844ac4b7e3188a00f9 (diff)
downloadforums-465d0b1a4c665468e188381f6e83376bfde9422a.tar
forums-465d0b1a4c665468e188381f6e83376bfde9422a.tar.gz
forums-465d0b1a4c665468e188381f6e83376bfde9422a.tar.bz2
forums-465d0b1a4c665468e188381f6e83376bfde9422a.tar.xz
forums-465d0b1a4c665468e188381f6e83376bfde9422a.zip
[ticket/16043] Check if not null before getting anything from the container
This is only happening when there is basicly an error during init of the container. PHPBB3-16043
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e1f6fa3d1b..c2f173b345 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3395,7 +3395,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
$log_text .= '<br /><br />BACKTRACE<br />' . $backtrace;
}
- if (defined('IN_INSTALL') || $phpbb_container->getParameter('debug.show_errors') || isset($auth) && $auth->acl_get('a_'))
+ if (defined('IN_INSTALL') || ($phpbb_container != null && $phpbb_container->getParameter('debug.show_errors')) || isset($auth) && $auth->acl_get('a_'))
{
$msg_text = $log_text;