summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-08-15 10:08:22 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-08-15 10:08:22 +0000
commitece3040e2fa5779d061ee628a4e708f36b548ae6 (patch)
tree145a6b857ee3ef35d7bc3419a5c3ee8eb41221fe
parent979a2603b111c40245d45266823a7551e06248a6 (diff)
- added missing { and } when displaying trigger expressions (Alexei)
[svn merge -r4571:4574 svn://svn.zabbix.com/branches/1.4.2] git-svn-id: svn://svn.zabbix.com/trunk@4575 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--ChangeLog1
-rw-r--r--frontends/php/include/triggers.inc.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f8e9aafd..af14c357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Changes for 1.5:
Changes for 1.4.2:
+ - added missing { and } when displaying trigger expressions (Alexei)
- fixed processing of negative SNMP integers (Alexei)
- fixed processing of MM in format of log timestamps (Alexei)
- added missing index on items_applications.itemid (Alexei)
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 144437a0..6b5cd5c5 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -920,7 +920,7 @@
'history.php?action='.( $function_data["value_type"] ==0 ? 'showvalues' : 'showgraph').
'&itemid='.$function_data['itemid']);
- $exp .= $link->ToString().'.'.bold($function_data["function"].'(').$function_data["parameter"].bold(')');
+ $exp .= '{'.$link->ToString().'.'.bold($function_data["function"].'(').$function_data["parameter"].bold(')').'}';
}
}
else