Merge branch 'develop' into template-v2

This commit is contained in:
Kijin Sung 2023-10-10 15:13:47 +09:00
commit a2767b0dd8
4 changed files with 8 additions and 12 deletions

View file

@ -1,2 +1,2 @@
<h1 cond="$module_info->display_mobile_title != 'hide'">{$oDocument->getTitle()}</h1> <h1 cond="($module_info->display_mobile_title ?? '') !== 'hide'">{$oDocument->getTitle()}</h1>
{$oDocument->getContent($module_info->display_popupmenu != 'hide')} {$oDocument->getContent(($module_info->display_popupmenu ?? '') !== 'hide')}

View file

@ -5,10 +5,8 @@ class PageMobile extends PageView
{ {
function _getArticleContent() function _getArticleContent()
{ {
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument(0);
$oDocument = $oDocumentModel->getDocument(0); if($this->module_info->mdocument_srl ?? 0)
if($this->module_info->mdocument_srl)
{ {
$document_srl = $this->module_info->mdocument_srl; $document_srl = $this->module_info->mdocument_srl;
$oDocument->setDocument($document_srl); $oDocument->setDocument($document_srl);

View file

@ -141,10 +141,8 @@ class PageView extends Page
function _getArticleContent() function _getArticleContent()
{ {
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument(0);
$oDocument = $oDocumentModel->getDocument(0); if($this->module_info->document_srl ?? 0)
if($this->module_info->document_srl)
{ {
$document_srl = $this->module_info->document_srl; $document_srl = $this->module_info->document_srl;
$oDocument->setDocument($document_srl); $oDocument->setDocument($document_srl);

View file

@ -1,6 +1,6 @@
<block cond="$oDocument"> <block cond="$oDocument">
<h1 cond="$module_info->display_title != 'hide'">{$oDocument->getTitle()}</h1> <h1 cond="($module_info->display_title ?? '') !== 'hide'">{$oDocument->getTitle()}</h1>
{$oDocument->getContent($module_info->display_popupmenu != 'hide')} {$oDocument->getContent(($module_info->display_popupmenu ?? '') !== 'hide')}
</block> </block>
<block cond="!$oDocument"> <block cond="!$oDocument">
{$lang->none_content} {$lang->none_content}