Redone fix in dupliate data error handling.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 935dd4f3b09b25be76f9d223395565e01a389aee..030aedce585c3f0fbd9b32ea6aa434336f338dcd 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -25,6 +25,8 @@ $ -> Affected files
 $ /sql/en_US-demo.sql
 # Fixed to store default null values on export
 $ /admin/db/maintenance_db.inc
+! Display sql in case of duplicate data error when go_debug=1 - redone
+$ /includes/errors.inc
 
 01-Dec-2009 Joe Hunt
 ! Release 2.2.1

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;
 }
 
-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) 
-       {       $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;
        }
        
@@ -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)
 {
-       global $db;
+       global $db, $go_debug;
        $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);
                }