merge sandbox to trunk for 1.4.4.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7743 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-09-30 08:12:09 +00:00
parent b8299c8a65
commit 9139515e57
23 changed files with 93 additions and 38 deletions

View file

@ -705,15 +705,20 @@
**/
function fixQuotation($matches) {
$key = $matches[1];
$val = $matches[2];
$val = trim($matches[2]);
if(substr($val,0,1)!='"'){
if(substr($val,-1)=='/'){
$val = '"'.substr($val,0,-1).'" /';
}else{
$val = '"'.$val.'"';
}
$close_tag = false;
if(substr($val,-1)=='/') {
$close_tag = true;
$val = rtrim(substr($val,0,-1));
}
if($val{0}=="'" && substr($val,-1)=="'")
{
$val = sprintf('"%s"', substr($val,1,-1));
}
if($close_tag) $val .= ' /';
// attribute on* remove
if(preg_match('/^on(click|load|unload|blur|dbclick|focus|resize|keypress|keyup|keydown|mouseover|mouseout|mouseup|select|change|error)/',preg_replace('/[^a-zA-Z_]/','',$key))) return '';