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

Update references to TemplateHandler in common code paths

Browse source
This commit is contained in:
Kijin Sung 2023-10-10 15:05:46 +09:00
parent d46d25c69f
commit 45f016d53b
7 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/page/page.admin.view.php
View file

@ -260,7 +260,7 @@ class PageAdminView extends Page
$security->encodeHTML('widget_list..title','module_info.mid');
// Load admin resources
$oTemplate = TemplateHandler::getInstance();
$oTemplate = Rhymix\Framework\Template::getInstance();
$oTemplate->compile('modules/admin/tpl', '_admin_common.html');
// Set a template file

3
modules/page/page.mobile.php
View file

@ -5,8 +5,6 @@ class PageMobile extends PageView
{
function _getArticleContent()
{
$oTemplate = &TemplateHandler::getInstance();
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument(0);
@ -24,6 +22,7 @@ class PageMobile extends PageView
}
Context::set('oDocument', $oDocument);
$oTemplate = Rhymix\Framework\Template::getInstance();
$template_path = $this->getTemplatePath();
if (preg_match('!/skins/!', $template_path))
{

5
modules/page/page.view.php
View file

@ -141,8 +141,6 @@ class PageView extends Page
function _getArticleContent()
{
$oTemplate = &TemplateHandler::getInstance();
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument(0);
@ -154,6 +152,7 @@ class PageView extends Page
}
Context::set('oDocument', $oDocument);
$oTemplate = Rhymix\Framework\Template::getInstance();
$page_content = $oTemplate->compile($this->getTemplatePath(), 'content');
return $page_content;
@ -254,7 +253,7 @@ class PageView extends Page
if ($this->proc_tpl)
{
// Store compiled template in a temporary file.
$oTemplate = TemplateHandler::getInstance();
$oTemplate = Rhymix\Framework\Template::getInstance();
$real_target_dir = dirname($real_target_file);
$tmp_cache_file = preg_replace('/\.cache\.php$/', '.compiled.php', $cache_file);
$content = $oTemplate->compileDirect($real_target_dir . '/', basename($real_target_file));