fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

if layout_srl is rollback by module, set default layout

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12341 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-12-04 02:19:03 +00:00
parent 8811d5f725
commit a01bfdc22c
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
classes/module/ModuleHandler.class.php
View file

@ -158,7 +158,7 @@
// use the site default layout.
if($module_info->{$targetSrl} == -1)
{
$oLayoutAdminModel = getAdminModel('layout');
$oLayoutAdminModel = &getAdminModel('layout');
$layoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $module_info->site_srl);
}
else
@ -653,6 +653,14 @@
$layout_srl = $oModule->module_info->layout_srl;
}
// if layout_srl is rollback by module, set default layout
if($layout_srl == -1)
{
$viewType = (Mobile::isFromMobilePhone())? 'M' : 'P';
$oLayoutAdminModel = &getAdminModel('layout');
$layout_srl = $oLayoutAdminModel->getSiteDefaultLayout($viewType, $oModule->module_info->site_srl);
}
if($layout_srl && !$oModule->getLayoutFile()) {
// If layout_srl exists, get information of the layout, and set the location of layout_path/ layout_file