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

Fix #2226 warnings when module_info doesn't exist

Browse source
This commit is contained in:
Kijin Sung 2023-12-06 11:03:30 +09:00
parent 11b728bf4a
commit cb7b6cbfde
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/display/HTMLDisplayHandler.php
View file

@ -467,7 +467,7 @@ class HTMLDisplayHandler
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
$document_srl = Context::get('document_srl'); $document_srl = Context::get('document_srl');
$grant = Context::get('grant'); $grant = Context::get('grant');
$permitted = $grant->access; $permitted = isset($grant->access) ? $grant->access : false;
if (isset($grant->view) && !$grant->view) if (isset($grant->view) && !$grant->view)
{ {
$permitted = false; $permitted = false;
@ -480,7 +480,7 @@ class HTMLDisplayHandler
} }
else else
{ {
$oDocument = Context::get('oDocument') ?: getModel('document')->getDocument($document_srl, false, false); $oDocument = Context::get('oDocument') ?: DocumentModel::getDocument($document_srl, false, false);
if (is_object($oDocument) && $oDocument->document_srl == $document_srl) if (is_object($oDocument) && $oDocument->document_srl == $document_srl)
{ {
$page_type = 'article'; $page_type = 'article';

9
modules/ncenterlite/ncenterlite.controller.php
View file

@ -1065,8 +1065,6 @@ class NcenterliteController extends Ncenterlite
return; return;
} }
$module_info = Context::get('module_info');
$oNcenterliteModel = getModel('ncenterlite'); $oNcenterliteModel = getModel('ncenterlite');
$config = NcenterliteModel::getConfig(); $config = NcenterliteModel::getConfig();
@ -1082,7 +1080,8 @@ class NcenterliteController extends Ncenterlite
} }
// 노티바 제외 페이지이면 중지 // 노티바 제외 페이지이면 중지
if(is_array($config->hide_module_srls) && in_array($module_info->module_srl, $config->hide_module_srls)) $module_info = Context::get('module_info');
if(is_array($config->hide_module_srls) && in_array($module_info->module_srl ?? 0, $config->hide_module_srls))
{ {
return; return;
} }
@ -1319,6 +1318,10 @@ class NcenterliteController extends Ncenterlite
} }
$module_info = Context::get('module_info'); $module_info = Context::get('module_info');
if (!$module_info || !$module_info->module)
{
return false;
}
// DX 익명 체크박스 // DX 익명 체크박스
if($module_info->module == 'beluxe' && $triggerObj->anonymous == 'Y') if($module_info->module == 'beluxe' && $triggerObj->anonymous == 'Y')