diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-11-13 15:50:44 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-11-13 15:50:44 +0000 |
| commit | e10b288a4f07b76ce1a0b0428734e4034d8ac0ba (patch) | |
| tree | caca9118955b152be98c34b58364f68046dc33f0 /frontends/php/tr_status.php | |
| parent | 8b3aa4ea47c04a4254ec69beee62151386fef2a4 (diff) | |
| download | zabbix-e10b288a4f07b76ce1a0b0428734e4034d8ac0ba.tar.gz zabbix-e10b288a4f07b76ce1a0b0428734e4034d8ac0ba.tar.xz zabbix-e10b288a4f07b76ce1a0b0428734e4034d8ac0ba.zip | |
- [DEV-45] merged rev. 5009:5013 of branches/1.4.j/ (Artem) [fix for Trigger events]
git-svn-id: svn://svn.zabbix.com/trunk@5014 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/tr_status.php')
| -rw-r--r-- | frontends/php/tr_status.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php index c7288789..9b42e05c 100644 --- a/frontends/php/tr_status.php +++ b/frontends/php/tr_status.php @@ -411,7 +411,7 @@ include_once "include/page_header.php"; break; } - $event_sql = 'SELECT DISTINCT e.eventid, e.value, e.clock, e.objectid as triggerid, e.acknowledged '. + $event_sql = 'SELECT DISTINCT e.eventid, e.value, e.clock, e.objectid as triggerid, e.acknowledged, t.type '. ' FROM events e, triggers t '. ' WHERE e.object=0 AND e.objectid='.$row['triggerid']. ' AND t.triggerid=e.objectid '.$cond. |