diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-30 09:57:02 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-30 09:57:02 +0000 |
| commit | 7fe4773ebfff9cbe8f02e86aaeceae87ba4bf661 (patch) | |
| tree | caf3a82ccd8bd303c367b1bd20c7881ce8229c4b /frontends/php/triggers.php | |
| parent | 6f7349254398d8758d6b4affcdb4afe8b646e7ff (diff) | |
| download | zabbix-7fe4773ebfff9cbe8f02e86aaeceae87ba4bf661.tar.gz zabbix-7fe4773ebfff9cbe8f02e86aaeceae87ba4bf661.tar.xz zabbix-7fe4773ebfff9cbe8f02e86aaeceae87ba4bf661.zip | |
- support of macro {ITEM.LASTVALUE} for notifications and trigger names (Alexei)
[svn merge -r4699:4702 svn://svn.zabbix.com/branches/1.4]
git-svn-id: svn://svn.zabbix.com/trunk@4703 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/triggers.php')
| -rw-r--r-- | frontends/php/triggers.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontends/php/triggers.php b/frontends/php/triggers.php index a7c0ff05..72a37f3c 100644 --- a/frontends/php/triggers.php +++ b/frontends/php/triggers.php @@ -155,7 +155,7 @@ include_once "include/page_header.php"; $result = false; if($trigger_data = DBfetch( - DBselect("select distinct t.description,t.expression,h.host". + DBselect("select distinct t.triggerid,t.description,t.expression,h.host". " from triggers t left join functions f on t.triggerid=f.triggerid ". " left join items i on f.itemid=i.itemid ". " left join hosts h on i.hostid=h.hostid ". |