From 20d8801440d4dc03c213e59cd278183bb37f24b2 Mon Sep 17 00:00:00 2001
From: artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>
Date: Sat, 10 May 2008 10:55:37 +0000
Subject:  - [DEV-169] improved msg functionality in GUI (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5694 97f52cf1-0a1b-0410-bd0e-c28be96e8082
---
 frontends/php/include/db.inc.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'frontends/php/include/db.inc.php')

diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index e7d4b644..9656de35 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -270,6 +270,8 @@
 		
 		if(empty($result))
 			$result = $DB['TRANSACTION_STATE'];
+			
+//SDI('Result: '.$result);
 
 		if($result){ // OK
 			$result = DBcommit();
@@ -415,6 +417,12 @@
 				break;
 		}
 		
+		if($DB['TRANSACTIONS'] && !$result){
+			$DB['TRANSACTION_STATE'] &= $result;
+//			SDI($query);
+//			SDI($DB['TRANSACTION_STATE']);
+		}
+		
 		return $result;
 	}
 
@@ -470,7 +478,8 @@
 				}
 				break;
 		}
-		if($DB['TRANSACTIONS']){
+		
+		if($DB['TRANSACTIONS'] && !$result){
 			$DB['TRANSACTION_STATE'] &= $result;
 //			SDI($query);
 //			SDI($DB['TRANSACTION_STATE']);
-- 
cgit