aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2009-07-18 23:29:25 +0000
committerChris Smith <toonarmy@phpbb.com>2009-07-18 23:29:25 +0000
commitd61afd3509de3823c4f405fc95f8f799f073c505 (patch)
tree3c6a976f11d70c14adb78ed66a9b40b1e90383bd /phpBB/includes
parent1bc805f4add0346060d50e91167ccc4e135b0c38 (diff)
downloadforums-d61afd3509de3823c4f405fc95f8f799f073c505.tar
forums-d61afd3509de3823c4f405fc95f8f799f073c505.tar.gz
forums-d61afd3509de3823c4f405fc95f8f799f073c505.tar.bz2
forums-d61afd3509de3823c4f405fc95f8f799f073c505.tar.xz
forums-d61afd3509de3823c4f405fc95f8f799f073c505.zip
Ensure user errors are displayed regardless of PHP settings. #47505
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9785 89ea8834-ac86-4346-8a33-228a782c2dd0
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 d1a560f96d..2dd28b2ffe 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3295,7 +3295,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
global $phpEx, $phpbb_root_path, $msg_title, $msg_long_text;
// Do not display notices if we suppress them via @
- if (error_reporting() == 0)
+ if (error_reporting() == 0 && $errno != E_USER_ERROR && $errno != E_USER_WARNING && $errno != E_USER_NOTICE)
{
return;
}