merge from 1.5.3.2(r11162 ~ r11201)

and from luminous (r11141 ~ r11193)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11202 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-09-11 02:52:49 +00:00
parent 773a666d12
commit 42eb19ae10
32 changed files with 340 additions and 131 deletions

View file

@ -47,6 +47,7 @@
$layout_info = $oLayoutModel->getLayout($this->member_config->layout_srl);
if($layout_info)
{
$this->module_info->layout_srl = $this->member_config->layout_srl;
$this->setLayoutPath($layout_info->path);
}
}