- added support of macros $1,..., $9 (Alexei)

git-svn-id: svn://svn.zabbix.com/trunk@2061 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 3 insertions, 3 deletions

diff --git a/frontends/php/latest.php b/frontends/php/latest.php
index 07fbe946..2d9df7c6 100644
--- a/frontends/php/latest.php
+++ b/frontends/php/latest.php
@@ -257,9 +257,9 @@
 			$_GET["sort"]="order by i.description";
 		}
 		if(isset($_GET["select"]))
-			$sql="select h.host,i.itemid,i.description,i.lastvalue,i.prevvalue,i.lastclock,i.status,h.hostid,i.value_type,i.units,i.multiplier from items i,hosts h where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 and i.description like '%".$_GET["select"]."%' ".$_GET["sort"];
+			$sql="select h.host,i.itemid,i.description,i.lastvalue,i.prevvalue,i.lastclock,i.status,h.hostid,i.value_type,i.units,i.multiplier,i.key_ from items i,hosts h where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 and i.description like '%".$_GET["select"]."%' ".$_GET["sort"];
 		else
-			$sql="select h.host,i.itemid,i.description,i.lastvalue,i.prevvalue,i.lastclock,i.status,h.hostid,i.value_type,i.units,i.multiplier from items i,hosts h where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 and h.hostid=".$_GET["hostid"]." ".$_GET["sort"];
+			$sql="select h.host,i.itemid,i.description,i.lastvalue,i.prevvalue,i.lastclock,i.status,h.hostid,i.value_type,i.units,i.multiplier,i.key_ from items i,hosts h where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 and h.hostid=".$_GET["hostid"]." ".$_GET["sort"];
 		$result=DBselect($sql);
 		while($row=DBfetch($result))
 		{
@@ -279,7 +279,7 @@
 			{
 				table_td($row["host"],"");
 			}
-			table_td($row["description"],"");
+			table_td(item_description($row["description"],$row["key_"]),"");
 
 			echo "<td>";
 			if($row["status"] == 2)