mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-04 01:01:41 +09:00
Merge branch 'develop' into template-v2
This commit is contained in:
commit
a2767b0dd8
4 changed files with 8 additions and 12 deletions
|
|
@ -1,2 +1,2 @@
|
|||
<h1 cond="$module_info->display_mobile_title != 'hide'">{$oDocument->getTitle()}</h1>
|
||||
{$oDocument->getContent($module_info->display_popupmenu != 'hide')}
|
||||
<h1 cond="($module_info->display_mobile_title ?? '') !== 'hide'">{$oDocument->getTitle()}</h1>
|
||||
{$oDocument->getContent(($module_info->display_popupmenu ?? '') !== 'hide')}
|
||||
|
|
|
|||
|
|
@ -5,10 +5,8 @@ class PageMobile extends PageView
|
|||
{
|
||||
function _getArticleContent()
|
||||
{
|
||||
$oDocumentModel = getModel('document');
|
||||
$oDocument = $oDocumentModel->getDocument(0);
|
||||
|
||||
if($this->module_info->mdocument_srl)
|
||||
$oDocument = DocumentModel::getDocument(0);
|
||||
if($this->module_info->mdocument_srl ?? 0)
|
||||
{
|
||||
$document_srl = $this->module_info->mdocument_srl;
|
||||
$oDocument->setDocument($document_srl);
|
||||
|
|
|
|||
|
|
@ -141,10 +141,8 @@ class PageView extends Page
|
|||
|
||||
function _getArticleContent()
|
||||
{
|
||||
$oDocumentModel = getModel('document');
|
||||
$oDocument = $oDocumentModel->getDocument(0);
|
||||
|
||||
if($this->module_info->document_srl)
|
||||
$oDocument = DocumentModel::getDocument(0);
|
||||
if($this->module_info->document_srl ?? 0)
|
||||
{
|
||||
$document_srl = $this->module_info->document_srl;
|
||||
$oDocument->setDocument($document_srl);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<block cond="$oDocument">
|
||||
<h1 cond="$module_info->display_title != 'hide'">{$oDocument->getTitle()}</h1>
|
||||
{$oDocument->getContent($module_info->display_popupmenu != 'hide')}
|
||||
<h1 cond="($module_info->display_title ?? '') !== 'hide'">{$oDocument->getTitle()}</h1>
|
||||
{$oDocument->getContent(($module_info->display_popupmenu ?? '') !== 'hide')}
|
||||
</block>
|
||||
<block cond="!$oDocument">
|
||||
{$lang->none_content}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue