projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 2.2.2
[fa-stable.git]
/
includes
/
errors.inc
diff --git
a/includes/errors.inc
b/includes/errors.inc
index 1bbc71ff3ea917dc1af36380dd72109958100804..a9b68898498fb0e4f9854e678ad155b86a3bfa57 100644
(file)
--- a/
includes/errors.inc
+++ b/
includes/errors.inc
@@
-130,15
+130,13
@@
function display_db_error($msg, $sql_statement=null, $exit=true)
exit;
}
exit;
}
-function frindly_db_error($db_error
, $sql
)
+function frindly_db_error($db_error)
{
{
- global $db_duplicate_error_code
, $go_debug
;
+ global $db_duplicate_error_code;
if ($db_error == $db_duplicate_error_code)
if ($db_error == $db_duplicate_error_code)
- { $msg = _("The entered information is a duplicate. Please go back and enter different values.");
- if ($go_debug)
- $msg .= '<br>Sql that failed was :<br>'.$sql;
- display_error($msg);
+ {
+ display_error(_("The entered information is a duplicate. Please go back and enter different values."));
return true;
}
return true;
}
@@
-147,13
+145,13
@@
function frindly_db_error($db_error, $sql)
function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_error=true)
{
function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_error=true)
{
- global $db;
+ global $db
, $go_debug
;
$db_error = db_error_no();
if ($db_error != 0)
{
$db_error = db_error_no();
if ($db_error != 0)
{
- if (
!frindly_db_error($db_error, $sql_statement
)) {
+ if (
$go_debug || !frindly_db_error($db_error
)) {
display_db_error($msg, $sql_statement, false);
}
display_db_error($msg, $sql_statement, false);
}