summaryrefslogtreecommitdiffstats
path: root/frontends/php/tr_status.php
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-10-12 14:40:45 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-10-12 14:40:45 +0000
commitf1fcf4a2103bdc1beb9e348ea982ed7650527c8f (patch)
tree383faf9748ea44451eb20432b5f6211727682c12 /frontends/php/tr_status.php
parentcc3ab52e16eb4c908f69f23b159293df6bac3f23 (diff)
downloadzabbix-f1fcf4a2103bdc1beb9e348ea982ed7650527c8f.tar.gz
zabbix-f1fcf4a2103bdc1beb9e348ea982ed7650527c8f.tar.xz
zabbix-f1fcf4a2103bdc1beb9e348ea982ed7650527c8f.zip
- [ZBX-30,ZBX-47] better dependencies (Alexei)
[svn merge -r4862:4868 svn://svn.zabbix.com/branches/1.4] git-svn-id: svn://svn.zabbix.com/trunk@4869 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/tr_status.php')
-rw-r--r--frontends/php/tr_status.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php
index dbc26b65..ad0badf4 100644
--- a/frontends/php/tr_status.php
+++ b/frontends/php/tr_status.php
@@ -400,12 +400,7 @@ echo '<script type="text/javascript" src="js/blink.js"></script>';
while($row=DBfetch($result)){
// Check for dependencies
- $deps = DBfetch(DBselect("select count(*) as cnt from trigger_depends d, triggers t ".
- " where d.triggerid_down=".$row["triggerid"]." and d.triggerid_up=t.triggerid and t.value=1"));
-
- if($deps["cnt"]>0){
- continue;
- }
+ if(trigger_dependent($row["triggerid"])) continue;
$cond = '';
$ack_expire = ($config['ack_expire']*86400);