Merge 1.5.2.3 (~r10623)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10624 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-04-26 09:17:29 +00:00
parent 79fdf10866
commit e4306a789f
915 changed files with 71076 additions and 245 deletions

View file

@ -697,7 +697,19 @@
// xmp tag 확인 및 추가
$content = checkXmpTag($content);
return $content;
if(version_compare(PHP_VERSION, "5.3.0") >= 0)
{
// purifier setting
require_once _XE_PATH_.'classes/security/htmlpurifier/library/HTMLPurifier.auto.php';
require_once 'HTMLPurifier.func.php';
$config = HTMLPurifier_Config::createDefault();
$config->set('HTML.TidyLevel', 'light');
$config->set('HTML.SafeObject', true);
$purifier = new HTMLPurifier($config);
$content = $purifier->purify($content);
}
return $content;
}
/**
@ -742,6 +754,17 @@
$attr = array();
foreach($attrs as $name=>$val) {
if($tag == 'object' || $tag == 'embed' || $tag == 'a')
{
$attribute = strtolower(trim($name));
if($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
{
if(strpos(strtolower($val), 'data:') === 0)
{
continue;
}
}
}
$val = str_replace('"', '"', $val);
$attr[] = $name."=\"{$val}\"";
}