summaryrefslogtreecommitdiffstats
path: root/frontends/php/include
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-11-15 15:21:40 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-11-15 15:21:40 +0000
commit99b5f5809d93f3fccf0553db7c156b781826f10b (patch)
tree0b99cda954c5268e1ae24c8de6395d2216127b1f /frontends/php/include
parentbb428111cfebc82ba9a31e5da0a807033cac41b7 (diff)
downloadzabbix-99b5f5809d93f3fccf0553db7c156b781826f10b.tar.gz
zabbix-99b5f5809d93f3fccf0553db7c156b781826f10b.tar.xz
zabbix-99b5f5809d93f3fccf0553db7c156b781826f10b.zip
- [ZBX-164] added support of units for values used in notifications (Alexei)
[svn merge -r5043:5051 svn://svn.zabbix.com/branches/1.4] git-svn-id: svn://svn.zabbix.com/trunk@5052 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
-rw-r--r--frontends/php/include/config.inc.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index cd13129a..0d339385 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -400,8 +400,9 @@ function TODO($msg) { echo "TODO: ".$msg.BR; } // DEBUG INFO!!!
{
list($usec, $sec) = explode(" ",microtime());
return ((float)$usec + (float)$sec);
- }
+ }
+ /* Do not forget to sync it with add_value_suffix in evalfunc.c! */
function convert_units($value,$units)
{
// Special processing for unix timestamps