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

Fix #1470 misc errors in PHP 8.0

Browse source
This commit is contained in:
Kijin Sung 2020-11-30 21:56:15 +09:00
parent cc1a00e923
commit 7d8a546b64
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
classes/xml/XmlJsFilter.class.php
View file

@ -348,20 +348,16 @@ class XmlJsFilter extends XeXmlParser
} }
// generates the response script // generates the response script
$response_count = count($response_tag);
$responses = array(); $responses = array();
for($i = 0; $i < $response_count; $i++) foreach ($response_tag ?: [] as $val)
{ {
$attrs = $response_tag[$i]->attrs; $name = $val->attrs->name;
$name = $attrs->name;
$responses[] = "'{$name}'"; $responses[] = "'{$name}'";
} }
// writes lang values of the form field // writes lang values of the form field
$target_count = count($target_list); foreach ($target_list ?: [] as $target)
for($i = 0; $i < $target_count; $i++)
{ {
$target = $target_list[$i];
if(!$lang->{$target}) if(!$lang->{$target})
{ {
$lang->{$target} = $target; $lang->{$target} = $target;

2
modules/admin/admin.admin.controller.php
View file

@ -838,7 +838,7 @@ class adminAdminController extends admin
// Languages and time zone // Languages and time zone
$enabled_lang = $vars->enabled_lang; $enabled_lang = $vars->enabled_lang;
if (!in_array($vars->default_lang, $enabled_lang)) if (!in_array($vars->default_lang, $enabled_lang ?: []))
{ {
$enabled_lang[] = $vars->default_lang; $enabled_lang[] = $vars->default_lang;
} }

4
modules/menu/menu.admin.controller.php
View file

@ -128,7 +128,7 @@ class menuAdminController extends menu
{ {
// 'unlinked' menu 존재여부 확인 // 'unlinked' menu 존재여부 확인
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');
$moduleConfig = $oModuleModel->getModuleConfig('menu'); $moduleConfig = $oModuleModel->getModuleConfig('menu') ?: new stdClass;
if($moduleConfig->unlinked_menu_srl) if($moduleConfig->unlinked_menu_srl)
{ {
@ -1745,7 +1745,7 @@ class menuAdminController extends menu
} }
} }
if(count($grant)) if(countobj($grant))
{ {
$oModuleController = getController('module'); $oModuleController = getController('module');
$oModuleController->insertModuleGrants($moduleInfo->module_srl, $grant); $oModuleController->insertModuleGrants($moduleInfo->module_srl, $grant);