merge with 1.4.5 branch(1.4.5.10)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@9269 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 05:29:04 +00:00
parent 92332c8ebb
commit a0d57a320f
98 changed files with 970 additions and 432 deletions

View file

@ -13,7 +13,7 @@
function init() {
$this->setTemplatePath($this->module_path.'tpl');
}
/**
* @brief 위젯 목록을 보여줌
**/
@ -24,6 +24,9 @@
Context::set('widget_list', $widget_list);
$this->setTemplateFile('downloaded_widget_list');
$security = new Security();
$security->encodeHTML('widget_list..', 'widget_list..author..');
}
/**
@ -47,6 +50,9 @@
$editor = $oEditorModel->getModuleEditor('document',$module_srl, $module_srl,'module_srl','content');
Context::set('editor', $editor);
$security = new Security();
$security->encodeHTML('member_config..');
$this->setLayoutFile("popup_layout");
$this->setTemplateFile('add_content_widget');