summaryrefslogtreecommitdiffstats
path: root/frontends/php
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-08-20 12:50:22 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-08-20 12:50:22 +0000
commit9421d2da686bb6a5ea6df277bbfde0bbc32038df (patch)
tree23e64695eb942090dcf3b48dfa7f0e3c2b4b9e04 /frontends/php
parent5e7bd13ae6c025f5a62a8a3c18b857466979903e (diff)
downloadzabbix-9421d2da686bb6a5ea6df277bbfde0bbc32038df.tar.gz
zabbix-9421d2da686bb6a5ea6df277bbfde0bbc32038df.tar.xz
zabbix-9421d2da686bb6a5ea6df277bbfde0bbc32038df.zip
- 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
Diffstat (limited to 'frontends/php')
-rw-r--r--frontends/php/include/triggers.inc.php2
1 files changed, 1 insertions, 1 deletions
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 )