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 | |
| 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
| -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 218ed0b90e..5d517051d0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -161,6 +161,7 @@ <li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li> <li>[Fix] Correct behavior of "force_approved_state" when value is false. (Bug #57715)</li> <li>[Fix] Global announcements could not be accessed on a board using Firebird as the database server. (Bug #57525)</li> + <li>[Fix] Ensure a database connection is available before logging general errors. (Bug #57975)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> 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); |