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

#1047 레이이아웃 편집 시 layout.css 파일을 로드하지 못하는 문제 고침

Browse source
This commit is contained in:
bnu 2014-11-21 11:05:04 +09:00
parent 4b6c3dbf94
commit 388597c037
2 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/layout/layout.admin.model.php
View file

@ -111,23 +111,20 @@ class layoutAdminModel extends layout
}
// Get Layout Code
$oLayoutModel = getModel('layout');
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
if(!file_exists($layout_file))
if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
{
// If faceoff
if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
{
$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
}
else
{
$layout_file = sprintf('%s%s', $layout_info->path, 'layout.html');
}
$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
$layout_css_file = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
}
else
{
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
}
$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
if(file_exists($layout_css_file))
{
$layout_code_css = FileHandler::readFile($layout_css_file);

24
modules/layout/layout.admin.view.php
View file

@ -237,22 +237,20 @@ class layoutAdminView extends layout
if(!$layout_info) return $this->dispLayoutAdminInstalledList();
// Get Layout Code
$oLayoutModel = getModel('layout');
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
if(!file_exists($layout_file))
if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
{
// If faceoff
if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
{
$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
}
else
{
$layout_file = sprintf('%s%s', $layout_info->path, 'layout.html');
}
$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
$layout_css_file = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
}
else
{
$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
}
$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
if(file_exists($layout_css_file))
{
$layout_code_css = FileHandler::readFile($layout_css_file);