X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db.inc;h=fda58ab32e1863a95b739bd74f52a1cb1f861d73;hb=7840540918bfd37c886877a5d52e3ba0b3373289;hp=ed706fe31401ef82b8f1b15215551c51bd47a243;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index ed706fe3..fda58ab3 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -36,8 +36,8 @@ $db_duplicate_error_code = 1062;
 function db_query($sql, $err_msg=null)
 {
 	global $db, $show_sql, $sql_trail, $select_trail, $go_debug, $sql_queries, $Ajax,
-		$db_connections;
-	
+		$db_connections, $db_last_inserted_id;
+
 	// set current db prefix
 	$cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
 	$sql = str_replace(TB_PREF, $cur_prefix, $sql);
@@ -49,7 +49,9 @@ function db_query($sql, $err_msg=null)
 	}
 
 	$result = mysql_query($sql, $db);
+
 	if($sql_trail) {
+		$db_last_inserted_id = mysql_insert_id($db);	// preserve in case trail insert is done
 		if ($select_trail || (strstr($sql, 'SELECT') === false)) {
 			mysql_query(
 			"INSERT INTO ".$cur_prefix."sql_trail
@@ -150,8 +152,9 @@ function db_error_msg($conn)
 
 function db_insert_id()
 {
-	global $db;
-	return mysql_insert_id($db);
+	global $db_last_inserted_id, $sql_trail, $db;
+
+	return $sql_trail ? $db_last_inserted_id : mysql_insert_id($db);
 }
 
 function db_num_affected_rows()