- 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, 2 insertions, 2 deletions

diff --git a/frontends/php/map.html b/frontends/php/map.html
index 0a0511aa..dce478e0 100644
--- a/frontends/php/map.html
+++ b/frontends/php/map.html
@@ -111,12 +111,12 @@
 		}
 		else
 		{
-			$result1=DBselect("select count(*) from items i,functions f,triggers t,hosts h where h.hostid=i.hostid and i.hostid=$hostid and i.itemid=f.itemid and f.triggerid=t.triggerid and t.istrue=1 and h.status=0 and i.status=0");
+			$result1=DBselect("select count(*) from items i,functions f,triggers t,hosts h where h.hostid=i.hostid and i.hostid=$hostid and i.itemid=f.itemid and f.triggerid=t.triggerid and t.istrue=1 and h.status in (0,2) and i.status=0");
 			$count=DBget_field($result1,0,0);
 			if($count==1)
 			{
 				$color=$red;
-				$result1=DBselect("select t.description from items i,functions f,triggers t,hosts h where h.hostid=i.hostid and i.hostid=$hostid and i.itemid=f.itemid and f.triggerid=t.triggerid and t.istrue=1 and h.status=0 and i.status=0");
+				$result1=DBselect("select t.description from items i,functions f,triggers t,hosts h where h.hostid=i.hostid and i.hostid=$hostid and i.itemid=f.itemid and f.triggerid=t.triggerid and t.istrue=1 and h.status (0,2) and i.status=0");
 				$label=DBget_field($result1,0,0);
 			}
 			else if($count>1)