merge from luminous (r11590)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11632 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-08 10:09:47 +00:00
parent ca554aad56
commit 2bf71d6660
4 changed files with 34 additions and 1 deletions

View file

@ -35,6 +35,13 @@
// get a list of communication skins
Context::set('communication_mobile_skin_list', $oModuleModel->getSkins($this->module_path, 'm.skins') );
// Get a layout list
$layout_list = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layout_list);
$mlayout_list = $oLayoutModel->getLayoutList(0, 'M');
Context::set('mlayout_list', $mlayout_list);
$security = new Security();
$security->encodeHTML('communication_config..');
$security->encodeHTML('layout_list..');