aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2010-02-22 00:57:01 +0000
committerChris Smith <toonarmy@phpbb.com>2010-02-22 00:57:01 +0000
commite01171ca85e09b10a93337c9a88022545dee23c1 (patch)
treefe8ec059c54d8270fd413985880edd0b1dc6991f /phpBB/includes/functions.php
parent22621e043963dca078580eaf61b45c5022ca79e1 (diff)
downloadforums-e01171ca85e09b10a93337c9a88022545dee23c1.tar
forums-e01171ca85e09b10a93337c9a88022545dee23c1.tar.gz
forums-e01171ca85e09b10a93337c9a88022545dee23c1.tar.bz2
forums-e01171ca85e09b10a93337c9a88022545dee23c1.tar.xz
forums-e01171ca85e09b10a93337c9a88022545dee23c1.zip
General errors can't be logged if there isn't a database connection, introduced in r9924 #57975
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10518 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-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 913b1c0fa0..364c8f4e9e 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3531,7 +3531,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
}
}
- if (defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT'))
+ if ((defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT')) && isset($db))
{
// let's avoid loops
$db->sql_return_on_error(true);