From b5f75271b92d36a95cc00ea4d0b02e047160de2b Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Thu, 6 Aug 2015 09:20:39 +0000
Subject: [PATCH] #1121: Regression: "filters" on Triggers had no effect. The
 regression was caused by the new way of computing placeholders "on the fly"
 (#803).

SVN:trunk[3671]
---
 core/trigger.class.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php
index 7b0ae7d42..0c5f9a0dc 100644
--- a/core/trigger.class.inc.php
+++ b/core/trigger.class.inc.php
@@ -158,9 +158,9 @@ abstract class TriggerOnObject extends Trigger
 	public function DoActivate($aContextArgs)
 	{
 		$bGo = true;
-		if (isset($aContextArgs['this->id']))
+		if (isset($aContextArgs['this->object()']))
 		{
-			$bGo = $this->IsTargetObject($aContextArgs['this->id']);
+			$bGo = $this->IsTargetObject($aContextArgs['this->object()']->GetKey());
 		}
 		if ($bGo)
 		{