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

Fix warnings in PHP 8 #2150 @eondcom

Browse source
This commit is contained in:
Kijin Sung 2023-07-17 20:51:47 +09:00
parent 84c473dda1
commit 13ef40c772
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/admin/models/Favorite.php
View file

@ -32,8 +32,8 @@ class Favorite
foreach ($output->data as $key => $value) foreach ($output->data as $key => $value)
{ {
$module_info = ModuleModel::getModuleInfoXml($value->module); $module_info = ModuleModel::getModuleInfoXml($value->module);
$output->data[$key]->admin_index_act = $module_info->admin_index_act; $output->data[$key]->admin_index_act = $module_info->admin_index_act ?? null;
$output->data[$key]->title = $module_info->title; $output->data[$key]->title = $module_info->title ?? null;
} }
} }

11
modules/layout/layout.model.php
View file

@ -280,11 +280,18 @@ class layoutModel extends layout
$args = new stdClass(); $args = new stdClass();
$args->layout_srl = $layout_srl; $args->layout_srl = $layout_srl;
$output = executeQuery('layout.getLayout', $args); $output = executeQuery('layout.getLayout', $args);
if(!$output->data) return; if (!$output->data)
$layout = $output->data->layout; {
return;
}
// Return xml file informaton after listing up the layout and extra_vars // Return xml file informaton after listing up the layout and extra_vars
$layout = $output->data->layout;
$layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type); $layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type);
if (!$layout_info)
{
return;
}
// Check if layout has been edited // Check if layout has been edited
if (file_exists(\RX_BASEDIR . 'files/faceOff/' . getNumberingPath($layout_srl) . 'layout.html') || if (file_exists(\RX_BASEDIR . 'files/faceOff/' . getNumberingPath($layout_srl) . 'layout.html') ||