- 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

1 files changed, 2 insertions, 2 deletions

diff --git a/frontends/php/popup.php b/frontends/php/popup.php
index 929c225b..5212801d 100644
--- a/frontends/php/popup.php
+++ b/frontends/php/popup.php
@@ -596,7 +596,7 @@ include_once "include/page_header.php";
 			S_STATUS));
 
 
-		$sql = "select h.host,t.triggerid,t.description,t.priority,t.status,count(d.triggerid_up) as dep_count ".
+		$sql = "select h.host,t.triggerid,t.description,t.expression,t.priority,t.status,count(d.triggerid_up) as dep_count ".
 			" from hosts h,items i,functions f, triggers t left join trigger_depends d on d.triggerid_down=t.triggerid ".
 			" where f.itemid=i.itemid and h.hostid=i.hostid and t.triggerid=f.triggerid".
 			' and '.DBin_node('t.triggerid', $nodeid).
@@ -607,7 +607,7 @@ include_once "include/page_header.php";
 		if(isset($hostid)) 
 			$sql .= " and h.hostid=$hostid";
 
-		$sql .= " group by h.host, t.triggerid, t.description, t.priority, t.status".
+		$sql .= " group by h.host, t.triggerid, t.description, t.expression, t.priority, t.status".
 			" order by h.host,t.description";
 
 		$result=DBselect($sql);