diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-25 14:05:30 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-25 14:05:30 +0000 |
| commit | 7fa38045c733627b7d528c5722dc2ffa702c862c (patch) | |
| tree | d2634b9fab8cbf3645a8e5e0b349bcb64912d326 /frontends/php/include/triggers.inc.php | |
| parent | bb7db0ed62417d62c21d55c0518304c25805af91 (diff) | |
| download | zabbix-7fa38045c733627b7d528c5722dc2ffa702c862c.tar.gz zabbix-7fa38045c733627b7d528c5722dc2ffa702c862c.tar.xz zabbix-7fa38045c733627b7d528c5722dc2ffa702c862c.zip | |
- [DEV-56] added better item selection in screens (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@4913 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/triggers.inc.php')
| -rw-r--r-- | frontends/php/include/triggers.inc.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php index cc955c55..31f7feb8 100644 --- a/frontends/php/include/triggers.inc.php +++ b/frontends/php/include/triggers.inc.php @@ -1105,13 +1105,15 @@ if(strstr($description,"{ITEM.LASTVALUE}")) { - $row2=DBfetch(DBselect('select i.lastvalue from items i, triggers t, functions f '. - ' where i.itemid=f.itemid and f.triggerid=t.triggerid and '. - ' t.triggerid='.$row["triggerid"])); + $row2=DBfetch(DBselect('SELECT i.lastvalue, i.value_type, i.itemid '. + ' FROM items i, triggers t, functions f '. + ' WHERE i.itemid=f.itemid '. + ' AND f.triggerid=t.triggerid '. + ' AND t.triggerid='.$row['triggerid'])); - if($row2["value_type"]!=ITEM_VALUE_TYPE_LOG) + if($row2['value_type']!=ITEM_VALUE_TYPE_LOG) { - $description = str_replace("{ITEM.LASTVALUE}", $row2["lastvalue"],$description); + $description = str_replace('{ITEM.LASTVALUE}', $row2['lastvalue'],$description); } else { |