From 9421d2da686bb6a5ea6df277bbfde0bbc32038df Mon Sep 17 00:00:00 2001
From: osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>
Date: Mon, 20 Aug 2007 12:50:22 +0000
Subject:  - merged rev. 4628:4629 of branches/1.4.2 (Eugene) [fixed validation
 of trigger expression]

git-svn-id: svn://svn.zabbix.com/trunk@4630 97f52cf1-0a1b-0410-bd0e-c28be96e8082
---
 ChangeLog                              | 1 +
 frontends/php/include/triggers.inc.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cffc5a21..3e66ad65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Changes for 1.5:
 
 Changes for 1.4.2:
 
+ - fixed validation of trigger expression (Eugene)
  - fixed '{HOSTNAME}' macros using for actions (Eugene)
  - fixed e-mail sending to the pedantic qmail (Eugene)
  - fixed communication between systems with different byte orders (Eugene)
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 22821f5d..73b09ae9 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -659,7 +659,7 @@
 
 		while($res = ereg($expr_full_format.'([[:print:]]*)$', $expr, $arr))
 		{
-			$expr = substr($expr, 0, strpos($expr, $arr[1])).$ZBX_TR_EXPR_REPLACE_TO.$arr[54];
+			$expr = substr($expr, 0, strpos($expr, $arr[1])).$ZBX_TR_EXPR_REPLACE_TO.$arr[58];
 		}
 
 		if ( $ZBX_TR_EXPR_REPLACE_TO != $expr )
-- 
cgit