diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-07-18 23:29:25 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-07-18 23:29:25 +0000 |
| commit | d61afd3509de3823c4f405fc95f8f799f073c505 (patch) | |
| tree | 3c6a976f11d70c14adb78ed66a9b40b1e90383bd /phpBB | |
| parent | 1bc805f4add0346060d50e91167ccc4e135b0c38 (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5d03c71443..8f667faef2 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -163,6 +163,7 @@ <li>[Fix] Add hard limit for smilies.</li> <li>[Fix] Remove redundant SQL query from ucp.php. (Bug #40305)</li> <li>[Fix] Reorder frame order of animated subsilver2 topic icons to be useful when animation is disabled. (Bug #29385 - Patch by prototech)</li> + <li>[Fix] Ensure user errors are displayed regardless of PHP settings. (Bug #47505)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> 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; } |