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

Fix error when loading external page in document root folder

Browse source
This commit is contained in:
Kijin Sung 2022-03-16 00:54:10 +09:00
parent 63fa80db82
commit 9ce7593820
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/template/TemplateHandler.class.php
View file

@ -93,11 +93,16 @@ class TemplateHandler
{
// verify arguments
$tpl_path = trim(preg_replace('@^' . preg_quote(\RX_BASEDIR, '@') . '|\./@', '', str_replace('\\', '/', $tpl_path)), '/') . '/';
if($tpl_path === '/' || !is_dir($tpl_path))
if($tpl_path === '/')
{
$tpl_path = '';
}
elseif(!is_dir(\RX_BASEDIR . $tpl_path))
{
$this->resetState();
return;
}
if(!file_exists(\RX_BASEDIR . $tpl_path . $tpl_filename) && file_exists(\RX_BASEDIR . $tpl_path . $tpl_filename . '.html'))
{
$tpl_filename .= '.html';

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

@ -241,7 +241,7 @@ class pageView extends page
$oTemplate = TemplateHandler::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));
$content = $oTemplate->compileDirect($real_target_dir . '/', basename($real_target_file));
$success = Rhymix\Framework\Storage::write($tmp_cache_file, $content);
if (!$success)
{