Index: branches/5.1.x/core/kernel/processors/main_processor.php =================================================================== diff -u -N -r13159 -r13395 --- branches/5.1.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 13159) +++ branches/5.1.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 13395) @@ -1,6 +1,6 @@ Application->GetVar($this->SelectParam($params, 'name,var,param'), ''); - return getArrayValue($params, 'htmlchars') ? htmlspecialchars($ret) : $ret; + $name = $this->SelectParam($params, 'name,var,param'); + $ret = $this->Application->GetVar($name, ''); + + if (array_key_exists('no_html_escape', $params) && $params['no_html_escape']) { + return unhtmlentities($ret); + } + + return $ret; } /** @@ -384,9 +390,8 @@ function GetConfig($params) { $config_name = $this->SelectParam($params, 'name,var'); - $ret = $this->Application->ConfigValue($config_name); - if( getArrayValue($params, 'escape') ) $ret = addslashes($ret); - return $ret; + + return $this->Application->ConfigValue($config_name); } function ConfigEquals($params)