$type = E_USER_NOTICE;
$content = '';
- $class = 'no_msg';
+// $class = 'no_msg';
if (count($messages)) {
foreach($messages as $cnt=>$msg) {
if ($msg[0]>$type) continue;
$content .= ($cnt ? '<hr>' : '').$str;
}
$class = $msg_class[$type];
+ $content = "<div class='$class'>$content</div>";
} else
- if ($path_to_root=='.')
- return '';
-
- $content = "<div class='$class'>$content</div>";
+ if ($path_to_root=='.')
+ return '';
return $content;
}
//-----------------------------------------------------------------------------
function display_db_error($msg, $sql_statement=null, $exit=true)
{
global $db, $debug;
+
+ $warning = $msg==null;
$db_error = db_error_no();
- $str = "<span class='errortext'><b>" . _("DATABASE ERROR :") . "</b> $msg</span><br>";
+// $str = "<span class='errortext'><b>" . _("DATABASE ERROR :") . "</b> $msg</span><br>";
+ if($warning)
+ $str = "<b>" . _("Debug mode database warning:") . "</b><br>";
+ else
+ $str = "<b>" . _("DATABASE ERROR :") . "</b> $msg<br>";
if ($db_error != 0)
{
}
$str .= "<br><br>";
-
- trigger_error($str, E_USER_ERROR);
-
+ if($msg)
+ trigger_error($str, E_USER_ERROR);
+ else // $msg can be null here only in debug mode, otherwise the error is ignored
+ trigger_error($str, E_USER_WARNING);
if ($exit)
exit;
}
if ($db_error != 0)
{
- if (!frindly_db_error($db_error))
- display_db_error($msg, $sql_statement, false);
+ if (!frindly_db_error($db_error)) {
+ display_db_error($msg, $sql_statement, false);
+ }
if ($rollback_if_error)
{