diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-26 17:48:17 +0200 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-24 01:14:25 -0500 |
| commit | d9fef488af150107b753b3c30e15ab5bf6d9da38 (patch) | |
| tree | 3c4a9bfcb0619eb9b42e09928579e78d780ed1b9 | |
| parent | 519db8e3b267c3f7135ba6bf30a25a4cc3e0a987 (diff) | |
| download | forums-d9fef488af150107b753b3c30e15ab5bf6d9da38.tar forums-d9fef488af150107b753b3c30e15ab5bf6d9da38.tar.gz forums-d9fef488af150107b753b3c30e15ab5bf6d9da38.tar.bz2 forums-d9fef488af150107b753b3c30e15ab5bf6d9da38.tar.xz forums-d9fef488af150107b753b3c30e15ab5bf6d9da38.zip | |
[ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
PHPBB3-9079
| -rw-r--r-- | phpBB/includes/db/dbal.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index b4c1a72e1c..230c9c8ed7 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -662,12 +662,7 @@ class dbal // The DEBUG_EXTRA constant is for development only! if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG_EXTRA')) { - // Print out a nice backtrace... - $backtrace = get_backtrace(); - $message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : ''; - $message .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : ''; - $message .= '<br />'; } else { diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 852fc683f2..f625f70c0f 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3853,6 +3853,13 @@ function msg_handler($errno, $msg_text, $errfile, $errline) } } + if (defined('IN_INSTALL') || defined('DEBUG_EXTRA') || isset($auth) && $auth->acl_get('a_')) + { + $backtrace = get_backtrace(); + $msg_text .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : ''; + $msg_text .= '<br />'; + } + if ((defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT')) && isset($db)) { // let's avoid loops |