- 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/report5.php b/frontends/php/report5.php
index 3abc20ae..e9dc651e 100644
--- a/frontends/php/report5.php
+++ b/frontends/php/report5.php
@@ -73,12 +73,12 @@ include_once "include/page_header.php";
 
 	$accessible_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY);
 	
-        $result=DBselect("select h.host, t.triggerid, t.description, t.priority, count(distinct e.eventid) as count ".
+        $result=DBselect("select h.host, t.triggerid, t.description, t.description, t.priority, count(distinct e.eventid) as count ".
 		" from hosts h, triggers t, functions f, items i, events e where ".
 		" h.hostid = i.hostid and i.itemid = f.itemid and t.triggerid=f.triggerid and ".
 		' t.triggerid=e.objectid and e.object='.EVENT_OBJECT_TRIGGER.' and e.clock>'.(time()-$time_dif).
 		' and h.hostid in ('.$accessible_hosts.') and '.DBin_node('t.triggerid').
-		" group by h.host,t.triggerid,t.description,t.priority ".
+		" group by h.host,t.triggerid,t.description,t.expression,t.priority ".
 		" order by count desc, h.host, t.description, t.triggerid", 100);
 
         while($row=DBfetch($result))