Merge 1.5.2.4 ( ~ r10652)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10653 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-03 05:43:44 +00:00
parent 412816433d
commit f0c12f5756
20 changed files with 3413 additions and 4275 deletions

View file

@ -696,19 +696,6 @@
// xmp tag 확인 및 추가
$content = checkXmpTag($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;
}