makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-27 04:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug #505838, debug messages didn't show SQL errors

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1919 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Bart van Bragt 2002-01-22 18:13:59 +00:00
parent 3c06a81ced
commit 417bedb382
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
phpBB/includes/functions.php
View file

@ -1018,6 +1018,32 @@ function message_die($msg_code, $msg_text = "", $msg_title = "", $err_line = "",
$sql_store = $sql; $sql_store = $sql;
//
// Get SQL error if we are debugging. Do this as soon as possible to prevent
// subsequent queries from overwriting the status of sql_error()
//
if(DEBUG && ( $msg_code == GENERAL_ERROR || $msg_code == CRITICAL_ERROR ) )
{
$sql_error = $db->sql_error();
$debug_text = "";
if($sql_error['message'] != "")
{
$debug_text .= "<br /><br />SQL Error : " . $sql_error['code'] . " " . $sql_error['message'];
}
if($sql_store != "")
{
$debug_text .= "<br /><br />$sql_store";
}
if($err_line != "" && $err_file != "")
{
$debug_text .= "</br /><br />Line : " . $err_line . "<br />File : " . $err_file;
}
}
if( empty($userdata) && ( $msg_code == GENERAL_MESSAGE || $msg_code == GENERAL_ERROR ) ) if( empty($userdata) && ( $msg_code == GENERAL_MESSAGE || $msg_code == GENERAL_ERROR ) )
{ {
$userdata = session_pagestart($user_ip, PAGE_INDEX, $session_length); $userdata = session_pagestart($user_ip, PAGE_INDEX, $session_length);
@ -1116,25 +1142,6 @@ function message_die($msg_code, $msg_text = "", $msg_title = "", $err_line = "",
// //
if(DEBUG && ( $msg_code == GENERAL_ERROR || $msg_code == CRITICAL_ERROR ) ) if(DEBUG && ( $msg_code == GENERAL_ERROR || $msg_code == CRITICAL_ERROR ) )
{ {
$sql_error = $db->sql_error();
$debug_text = "";
if($sql_error['message'] != "")
{
$debug_text .= "<br /><br />SQL Error : " . $sql_error['code'] . " " . $sql_error['message'];
}
if($sql_store != "")
{
$debug_text .= "<br /><br />$sql_store";
}
if($err_line != "" && $err_file != "")
{
$debug_text .= "</br /><br />Line : " . $err_line . "<br />File : " . $err_file;
}
if($debug_text != "") if($debug_text != "")
{ {
$msg_text = $msg_text . "<br /><br /><b><u>DEBUG MODE</u></b>" . $debug_text; $msg_text = $msg_text . "<br /><br /><b><u>DEBUG MODE</u></b>" . $debug_text;