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

Fix #1628 error in PHP 8.0 in editor component setup screen

Browse source
This commit is contained in:
Kijin Sung 2021-02-22 21:11:39 +09:00
parent 82398be24a
commit 9412cc4a22
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/editor/editor.admin.view.php
View file

@ -128,7 +128,10 @@ class editorAdminView extends editor
if(!is_array($mid_list)) $mid_list = array($mid_list); if(!is_array($mid_list)) $mid_list = array($mid_list);
foreach($mid_list as $module_srl => $module) foreach($mid_list as $module_srl => $module)
{ {
if($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; if($module && isset($module_categories[$module->module_category_srl]))
{
$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
}
} }
} }
else else

2
modules/editor/tpl/setup_component.html
View file

@ -32,7 +32,7 @@
<a href="#" onclick="winopen('{$component->link}');return false;">{$component->link}</a> <a href="#" onclick="winopen('{$component->link}');return false;">{$component->link}</a>
</div> </div>
</div> </div>
<block cond="count($component->extra_vars)"> <block cond="$component->extra_vars">
<block loop="$component->extra_vars => $id, $var"> <block loop="$component->extra_vars => $id, $var">
<block cond="$group != $var->group"> <block cond="$group != $var->group">
<h2>{$var->group}</h2> <h2>{$var->group}</h2>

9
modules/module/module.model.php
View file

@ -1320,13 +1320,10 @@ class moduleModel extends module
$args = new stdClass(); $args = new stdClass();
$args->moduleCategorySrl = $moduleCategorySrl; $args->moduleCategorySrl = $moduleCategorySrl;
// Get data from the DB // Get data from the DB
$output = executeQuery('module.getModuleCategories', $args); $output = executeQueryArray('module.getModuleCategories', $args);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$list = $output->data; $category_list = [];
if(!$list) return array(); foreach($output->data as $val)
if(!is_array($list)) $list = array($list);
foreach($list as $val)
{ {
$category_list[$val->module_category_srl] = $val; $category_list[$val->module_category_srl] = $val;
} }