diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-11-13 14:50:59 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-11-13 14:50:59 +0000 |
| commit | 5ee20e11121b75b4d24fcb00b345456efaff5c08 (patch) | |
| tree | 7c754fb2f9c2321d6559d3ec8f1b22f9736d6f5d /frontends/php/include | |
| parent | b7e6ea8fc716f07c7ab98e08a730c3db16ab97a4 (diff) | |
| download | zabbix-5ee20e11121b75b4d24fcb00b345456efaff5c08.tar.gz zabbix-5ee20e11121b75b4d24fcb00b345456efaff5c08.tar.xz zabbix-5ee20e11121b75b4d24fcb00b345456efaff5c08.zip | |
- [NTT-43] merged rev. 5003:5004 of branches/1.4/ (Artem) [fixed issue "Trigger still remains"]
git-svn-id: svn://svn.zabbix.com/trunk@5010 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/classes/ctag.inc.php | 4 | ||||
| -rw-r--r-- | frontends/php/include/triggers.inc.php | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/frontends/php/include/classes/ctag.inc.php b/frontends/php/include/classes/ctag.inc.php index f8a93ea2..923cc00a 100644 --- a/frontends/php/include/classes/ctag.inc.php +++ b/frontends/php/include/classes/ctag.inc.php @@ -83,8 +83,8 @@ function Destroy() { -### TODO Problem under PHP 5.0 "Fatal error: Cannot re-assign $this in ..." -# $this = null; +// TODO Problem under PHP 5.0 "Fatal error: Cannot re-assign $this in ..." +// $this = null; $this->CleanItems(); } diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php index 84bc67d5..a919ec1f 100644 --- a/frontends/php/include/triggers.inc.php +++ b/frontends/php/include/triggers.inc.php @@ -2251,6 +2251,7 @@ ' WHERE e.object=0 AND e.objectid='.$row['triggerid']. ' AND t.triggerid=e.objectid '.$cond. ' ORDER by e.eventid DESC'; + $res_events = DBSelect($sql,1); if(!$e_row=DBfetch($res_events)){ return false; @@ -2259,12 +2260,14 @@ $row = array_merge($row,$e_row); } - if(!event_initial_time($row)){ - if(!$eventid = first_initial_eventid($row,0)) continue; + if(($row['value']!=TRIGGER_VALUE_TRUE) && (!event_initial_time($row))){ + if(!$eventid = first_initial_eventid($row,0)) return false; $sql = 'SELECT e.eventid, e.value, e.clock as lastchange'. ' FROM events e '. - ' WHERE e.object=0 AND e.eventid='.$eventid; + ' WHERE e.object=0 '. + ' AND e.eventid='.$eventid. + ' AND e.acknowledged=0'; $res_events = DBSelect($sql,1); if(!$e_row=DBfetch($res_events)){ |