diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2010-02-22 00:59:27 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2010-02-22 00:59:27 +0000 |
| commit | 87bc1c67609abb39a3d17521da0540ed1c2d8173 (patch) | |
| tree | 6dca30641cb434b4b079ad5b60fad264d0788160 /phpBB/includes | |
| parent | 9aa4a822efac6763c0de22d5d62fe7e6b3c9c31a (diff) | |
| download | forums-87bc1c67609abb39a3d17521da0540ed1c2d8173.tar forums-87bc1c67609abb39a3d17521da0540ed1c2d8173.tar.gz forums-87bc1c67609abb39a3d17521da0540ed1c2d8173.tar.bz2 forums-87bc1c67609abb39a3d17521da0540ed1c2d8173.tar.xz forums-87bc1c67609abb39a3d17521da0540ed1c2d8173.zip | |
sneak attack merge r10518
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10519 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 81a11f4867..4b73aa4af9 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); |