merge from branch luminous (version 1.5.4.2, ~r12561)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions

View file

@ -76,6 +76,8 @@
}
function _getArticleContent(){
$oTemplate = &TemplateHandler::getInstance();
$oDocumentModel = &getModel('document');
$oDocument = $oDocumentModel->getDocument(0, true);
@ -86,13 +88,18 @@
}
Context::set('oDocument', $oDocument);
Context::set('module_info', $this->module_info);
if ($this->module_info->skin)
$this->setTemplatePath(sprintf($this->module_path.'skins/%s', $this->module_info->skin));
{
$templatePath = (sprintf($this->module_path.'skins/%s', $this->module_info->skin));
}
else
$this->setTemplatePath($this->module_path.'skins/default');
{
$templatePath = ($this->module_path.'skins/default');
}
$page_content = $oTemplate->compile($templatePath, 'content');
return $page_content;
}
function _getOutsideContent(){