- support of hysteresis (Alexei)

 - support of macro {TRIGGER.VALUE} in trigger expressions (Alexei)


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

1 files changed, 3 insertions, 1 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 44d40913..bfa13fc4 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -923,7 +923,9 @@ else
 				return -1;
 			}
 		}
-		else
+	# Process macros
+		else if($expression!="{TRIGGER.VALUE}")
+		
 		{
 			error("Expression [$expression] does not match to [server:key.func(param)]");
 			return -1;