summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/db.inc.php
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-05-10 10:55:37 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-05-10 10:55:37 +0000
commit20d8801440d4dc03c213e59cd278183bb37f24b2 (patch)
treee0acb0ec925da22ed6b1fab81b2d547670bbf050 /frontends/php/include/db.inc.php
parent8bfb00dbb5a1c423236630cddfeaa5ee74ab9659 (diff)
downloadzabbix-20d8801440d4dc03c213e59cd278183bb37f24b2.tar.gz
zabbix-20d8801440d4dc03c213e59cd278183bb37f24b2.tar.xz
zabbix-20d8801440d4dc03c213e59cd278183bb37f24b2.zip
- [DEV-169] improved msg functionality in GUI (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5694 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/db.inc.php')
-rw-r--r--frontends/php/include/db.inc.php11
1 files changed, 10 insertions, 1 deletions
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']);