aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-01-12 22:28:45 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-01-12 22:28:45 -0500
commitd7aa3aab5e40747e71d091d8033207f4363fb59c (patch)
treedf4beab692d2a8a9301e5250c91076e1c4cb4558 /phpBB/includes/db
parent95a74c7472ffa56d5fdcbbc2ec883d9f24db1037 (diff)
parentb6999237f456443b0b325f2ebee1f990ee7f5116 (diff)
downloadforums-d7aa3aab5e40747e71d091d8033207f4363fb59c.tar
forums-d7aa3aab5e40747e71d091d8033207f4363fb59c.tar.gz
forums-d7aa3aab5e40747e71d091d8033207f4363fb59c.tar.bz2
forums-d7aa3aab5e40747e71d091d8033207f4363fb59c.tar.xz
forums-d7aa3aab5e40747e71d091d8033207f4363fb59c.zip
Merge remote-tracking branch 'bantu/ticket/9079' into develop-olympus
* bantu/ticket/9079: [ticket/9079] Always log backtrace to error log when logging errors. [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r--phpBB/includes/db/dbal.php5
1 files changed, 0 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
{