summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/defines.inc.php
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-06-05 13:40:59 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-06-05 13:40:59 +0000
commit5d68bbe3b9d9e41ba5ff7e522ba4f1e4d5d5c709 (patch)
tree608b31b0452e38bebc99b98c77f3bec68bb8b1e8 /frontends/php/include/defines.inc.php
parent9f530afb97c103af9455963b1bd621fec83b4e3e (diff)
downloadzabbix-5d68bbe3b9d9e41ba5ff7e522ba4f1e4d5d5c709.tar.gz
zabbix-5d68bbe3b9d9e41ba5ff7e522ba4f1e4d5d5c709.tar.xz
zabbix-5d68bbe3b9d9e41ba5ff7e522ba4f1e4d5d5c709.zip
- merged from branches/1.4.1 rev. 4235:4236 (Eugene) [added availability of using '\'' character for key]
git-svn-id: svn://svn.zabbix.com/trunk@4237 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/defines.inc.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 d8d521e8..9da4e99e 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -382,7 +382,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:]]+)\)\}$');