- in case of network error, zabbix_suckerd will not try to request any parameters

 from the host during next 120 seconds (Alexei)
 - added directory upgrades/dbpatches/1.0alpha12_to_1.0beta1 (Alexei)
 - added column disabled_until to table hosts (Alexei)


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

1 files changed, 1 insertions, 1 deletions

diff --git a/frontends/php/report2.html b/frontends/php/report2.html
index 22747483..18806ae1 100644
--- a/frontends/php/report2.html
+++ b/frontends/php/report2.html
@@ -26,7 +26,7 @@
 
 <?
 
-	$result=DBselect("select h.hostid,h.host,t.triggerid,t.expression,t.description,t.istrue from triggers t,hosts h,items i,functions f where f.itemid=i.itemid and h.hostid=i.hostid and t.istrue!=2 and t.triggerid=f.triggerid and h.status=0 and i.status=0 order by h.host,t.lastchange desc, t.description");
+	$result=DBselect("select h.hostid,h.host,t.triggerid,t.expression,t.description,t.istrue from triggers t,hosts h,items i,functions f where f.itemid=i.itemid and h.hostid=i.hostid and t.istrue!=2 and t.triggerid=f.triggerid and h.status in (0,2) and i.status=0 order by h.host,t.lastchange desc, t.description");
 
 	$lasthost="";
 	$col=0;