Merge branch 'develop' into refactor/minify-on-the-fly

This commit is contained in:
Kijin Sung 2016-01-09 15:19:08 +09:00
commit 371f4a60b0
35 changed files with 2215 additions and 686 deletions

View file

@ -461,7 +461,6 @@ class adminAdminView extends admin
Context::set('htmlFooter', htmlspecialchars($config->htmlFooter));
// embed filter
require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
$oEmbedFilter = EmbedFilter::getInstance();
context::set('embed_white_object', implode(PHP_EOL, $oEmbedFilter->whiteUrlList));
context::set('embed_white_iframe', implode(PHP_EOL, $oEmbedFilter->whiteIframeUrlList));