Improvements for new algorithm for action handling.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/frontends/php/actions.php b/frontends/php/actions.php
index 3fdbfe3f..0921deab 100644
--- a/frontends/php/actions.php
+++ b/frontends/php/actions.php
@@ -146,7 +146,8 @@
 			$found=0;
 			while($row2=DBfetch($result2))
 			{
-				$sql="select * from actions a,triggers t,hosts h,functions f,items i where a.triggerid=t.triggerid and f.triggerid=t.triggerid and h.hostid=a.triggerid and i.hostid=h.hostid and a.actionid=".$row["actionid"]." and a.scope=1 and h.hostid=".$row2["hostid"];
+//				$sql="select * from actions a,triggers t,hosts h,functions f,items i where a.triggerid=t.triggerid and f.triggerid=t.triggerid and h.hostid=a.triggerid and i.hostid=h.hostid and a.actionid=".$row["actionid"]." and a.scope=1 and h.hostid=".$row2["hostid"];
+				$sql="select * from actions a where a.actionid=".$row["actionid"]." and a.scope=1 and a.triggerid=".$row2["hostid"];
 //				echo "$sql<br>";
 				$result3=DBselect($sql);
 				if(DBnum_rows($result3)>0)	$found=1;