mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity

sneak attack merge r10518

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10519 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2010-02-22 00:59:27 +00:00
parent 9aa4a822ef
commit 87bc1c6760
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View File

@ -161,6 +161,7 @@
<li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li> <li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li>
<li>[Fix] Correct behavior of &quot;force_approved_state&quot; when value is false. (Bug #57715)</li> <li>[Fix] Correct behavior of &quot;force_approved_state&quot; 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] 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] 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] 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> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>

2
phpBB/includes/functions.php
View File

@ -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 // let's avoid loops
$db->sql_return_on_error(true); $db->sql_return_on_error(true);