diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-22 14:01:27 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-22 14:01:27 +0000 |
| commit | 674e399c0e58a78d3308df9e345419cf53008144 (patch) | |
| tree | b8ed1eb9e605c27924383783138d873ea9234e3b /frontends/php/triggers.php | |
| parent | 397cf67462bd88e61cbf6f638854d8787f66c467 (diff) | |
| download | zabbix-674e399c0e58a78d3308df9e345419cf53008144.tar.gz zabbix-674e399c0e58a78d3308df9e345419cf53008144.tar.xz zabbix-674e399c0e58a78d3308df9e345419cf53008144.zip | |
- merged rev. 4636:463t of branches/1.4 (Eugene) [added numeric parameters support for trigger description ' .. ']
git-svn-id: svn://svn.zabbix.com/trunk@4639 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 404dbbd9..a7c0ff05 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,h.host". + DBselect("select distinct 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 ". |