issue 2369 add a layout info to module information.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11652 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-10 08:11:55 +00:00
parent 48a70b6b47
commit ca58440582

View file

@ -233,8 +233,38 @@
$oCacheHandler->put($cache_key,$output);
}
}
else
{
$moduleInfo = $coutput->data;
}
$moduleInfo->is_layout_fix = ($moduleInfo->layout_srl == -1000) ? 'N' : 'Y';
if($moduleInfo->is_layout_fix == 'N' || $moduleInfo->is_skin_fix == 'N')
{
$designInfoFile = sprintf(_XE_PATH_.'/files/site_design/design_%s.php', $moduleInfo->site_srl);
@include($designInfoFile);
}
if($moduleInfo->is_layout_fix == 'N')
{
$moduleInfo->layout_srl = $designInfo->layout_srl;
}
if($moduleInfo->is_skin_fix == 'N')
{
$moduleInfo->skin = $designInfo->module->{$moduleInfo->module}->skin;
$skinVars = $designInfo->module->{$moduleInfo->module}->skin_vars;
if($skinVars)
{
$skinVars = unserialize($skinVars);
foreach($skinVars as $key => $val)
{
$moduleInfo->{$key} = $val;
}
}
}
$moduleInfo = $this->addModuleExtraVars($moduleInfo);