From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Wed, 2 Dec 2009 12:37:36 +0000 (+0000)
Subject: Redone fix in dupliate data error handling.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=a4bad88736ddceab8ddb613583576749b17e2142;p=textcart.git

Redone fix in dupliate data error handling.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 935dd4f..030aedc 100644
--- 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 1bbc71f..a9b6889 100644
--- 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);
 		}