Index: branches/5.3.x/core/kernel/processors/main_processor.php =================================================================== diff -u -N -r15999 -r16111 --- branches/5.3.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 15999) +++ branches/5.3.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 16111) @@ -1,6 +1,6 @@ Application->GetVar($regs[1], Array ()); - array_unshift_ref($function_params, $ret); + $ret = $this->Application->GetVar($regs[1], array()); + kUtil::array_unshift_ref($function_params, $ret); - return call_user_func_array('getArrayValue', $function_params); + $ret = call_user_func_array('getArrayValue', $function_params); } else { $ret = $this->Application->GetVar($name, ''); } - if (array_key_exists('no_html_escape', $params) && $params['no_html_escape']) { - return htmlspecialchars_decode($ret); + if ( array_key_exists('no_html_escape', $params) && $params['no_html_escape'] ) { + return $this->Application->isAdmin ? $ret : kUtil::unescape($ret, kUtil::ESCAPE_HTML); } - return $ret; + return kUtil::escape($ret, kUtil::ESCAPE_HTML); } /**