summaryrefslogtreecommitdiffstats
path: root/frontends/php
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-05-31 08:33:16 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-05-31 08:33:16 +0000
commit1c57942f5b57f9afca03b111bf8a4eef2e00fb42 (patch)
tree09408bdf96d2a736c14977285bd8a7e095a06894 /frontends/php
parentc28d86f5ee7cddfde35cc61daa9a726e2e68509b (diff)
downloadzabbix-1c57942f5b57f9afca03b111bf8a4eef2e00fb42.tar.gz
zabbix-1c57942f5b57f9afca03b111bf8a4eef2e00fb42.tar.xz
zabbix-1c57942f5b57f9afca03b111bf8a4eef2e00fb42.zip
- merged from branches/1.4.1 rev. 4210:4213 (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@4216 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php')
-rw-r--r--frontends/php/include/defines.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index b4be08f6..24209da4 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -380,7 +380,7 @@
define('RARR', '&rArr;');
define('ZBX_EREG_HOST_FORMAT', '([0-9a-zA-Z\_\.[:space:][.-.]\$]+)');
- define('ZBX_EREG_ITEM_KEY_FORMAT', '([]\[0-9a-zA-Z!\_\*\/\.\,\:\(\)\+ [.-.]\$]+)');
+ define('ZBX_EREG_ITEM_KEY_FORMAT', '([]\[0-9a-zA-Z!\_\*\/\.\,\:\(\)\+ [.-.]\$%]+)');
define('ZBX_EREG_SIMPLE_EXPRESSION_FORMAT',
'^\{'.ZBX_EREG_HOST_FORMAT.'\:'.ZBX_EREG_ITEM_KEY_FORMAT.'\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,[:space:]]+)\)\}$');