diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-22 13:29:58 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-22 13:29:58 +0000 |
| commit | 7736ba321ca7873960b52f66917ec871a4ba6575 (patch) | |
| tree | 220a588a62d3de690b74322c444992c8e13fda01 /frontends/php/include | |
| parent | 1f4ca805e98c92c008ebd07d5da75e5d7abf82fd (diff) | |
Fixed trigger description displaying
git-svn-id: svn://svn.zabbix.com/trunk@4157 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/defines.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/include/forms.inc.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index fdae9bf1..295fb00d 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -383,7 +383,7 @@ 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:]]+)\)\}$'); + '^\{'.ZBX_EREG_HOST_FORMAT.'\:'.ZBX_EREG_ITEM_KEY_FORMAT.'\.([a-z]{3,11})\(([#0-9a-zA-Z\_\/\.\,[:space:]]+)\)\}$'); define('ZBX_SIMPLE_EXPRESSION_HOST_ID', 1); define('ZBX_SIMPLE_EXPRESSION_KEY_ID', 2); diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index 2ced8bb9..af2449d1 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -2210,7 +2210,7 @@ $frmTrig->AddVar("triggerid",$_REQUEST["triggerid"]); $trigger=get_trigger_by_triggerid($_REQUEST["triggerid"]); - $frmTrig->SetTitle(S_TRIGGER." \"".htmlspecialchars(stripslashes($trigger["description"]))."\""); + $frmTrig->SetTitle(S_TRIGGER." \"".htmlspecialchars($trigger["description"])."\""); $limited = $trigger['templateid'] ? 'yes' : null; } @@ -2224,7 +2224,7 @@ if((isset($_REQUEST["triggerid"]) && !isset($_REQUEST["form_refresh"])) || isset($limited)) { - $description = stripslashes($trigger["description"]); + $description = $trigger["description"]; $expression = explode_exp($trigger["expression"],0); if(!isset($limited) || !isset($_REQUEST["form_refresh"])) |