- fixed error when deleting a trigger (Alexei)

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

1 files changed, 0 insertions, 11 deletions

diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index cbb8f9fc..562b8d8b 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -150,11 +150,6 @@
 		{
 			return	$result;
 		}
-		$result=delete_actions_by_triggerid($triggerid);
-		if(!$result)
-		{
-			return	$result;
-		}
 		$result=delete_services_by_triggerid($triggerid);
 		if(!$result)
 		{
@@ -281,12 +276,6 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 		return	DBexecute($sql);
 	}
 
-	function	delete_actions_by_triggerid($triggerid)
-	{
-		$sql="delete from actions where triggerid=$triggerid and scope=0";
-		return	DBexecute($sql);
-	}
-
 	function	delete_alarms_by_triggerid($triggerid)
 	{
 		$sql="delete from alarms where triggerid=$triggerid";