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

issue 2367 added login that not used layout.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11654 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-10 08:39:37 +00:00
parent b5486fcc91
commit e1286d8b24
1 changed files with 48 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/layout/layout.view.php
View file

@ -56,11 +56,13 @@
$skinVars = json_decode($skinVars);
// Get the layout information.
if(!$layoutSrl || !$module)
if(!$mid && !$moduleSrl)
{
return new Object(-1, 'msg_invalid_request');
}
if($layoutSrl)
{
$oLayoutModel = getModel('layout');
$layoutInfo = $oLayoutModel->getLayout($layoutSrl);
@ -89,6 +91,7 @@
}
Context::set('layout_info', $layoutInfo);
}
// Get the module information.
$oModuleHandler = new ModuleHandler($module, '', $mid, '', $moduleSrl);
@ -123,8 +126,16 @@
// Compile
$oTemplate = &TemplateHandler::getInstance();
if($layoutSrl)
{
$layout_path = $layoutInfo->path;
$layout_file = 'layout';
}
else
{
$layout_path = './common/tpl';
$layout_file = 'default_layout';
}
$layout_tpl = $oTemplate->compile($layout_path, $layout_file);
Context::set('layout','none');