From 13ef40c772495bd0f6eedc235ee49ecea9b47a35 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 17 Jul 2023 20:51:47 +0900 Subject: [PATCH] Fix warnings in PHP 8 #2150 @eondcom --- modules/admin/models/Favorite.php | 4 ++-- modules/layout/layout.model.php | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/admin/models/Favorite.php b/modules/admin/models/Favorite.php index 11d26d2f8..bb841a56a 100644 --- a/modules/admin/models/Favorite.php +++ b/modules/admin/models/Favorite.php @@ -32,8 +32,8 @@ class Favorite foreach ($output->data as $key => $value) { $module_info = ModuleModel::getModuleInfoXml($value->module); - $output->data[$key]->admin_index_act = $module_info->admin_index_act; - $output->data[$key]->title = $module_info->title; + $output->data[$key]->admin_index_act = $module_info->admin_index_act ?? null; + $output->data[$key]->title = $module_info->title ?? null; } } diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php index d1cdb94c8..eb5389fa8 100644 --- a/modules/layout/layout.model.php +++ b/modules/layout/layout.model.php @@ -280,11 +280,18 @@ class layoutModel extends layout $args = new stdClass(); $args->layout_srl = $layout_srl; $output = executeQuery('layout.getLayout', $args); - if(!$output->data) return; - $layout = $output->data->layout; + if (!$output->data) + { + return; + } // 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); + if (!$layout_info) + { + return; + } // Check if layout has been edited if (file_exists(\RX_BASEDIR . 'files/faceOff/' . getNumberingPath($layout_srl) . 'layout.html') ||