merge 1.4.5.10

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9272 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 08:23:36 +00:00
commit 105e3f4843
66 changed files with 4864 additions and 214 deletions

View file

@ -34,6 +34,9 @@
Context::set('tCount', count($widget_list));
$this->setTemplateFile('downloaded_widget_list');
$security = new Security();
$security->encodeHTML('widget_list..', 'widget_list..author..');
}
function dispWidgetAdminGenerateCode()
@ -65,6 +68,9 @@
$editor = $oEditorModel->getModuleEditor('document',$module_srl, $module_srl,'module_srl','content');
Context::set('editor', $editor);
$security = new Security();
$security->encodeHTML('member_config..');
$this->setLayoutPath('./common/tpl');
$this->setLayoutFile("default_layout");
$this->setTemplateFile('add_content_widget');