From b7def41ec4c8abac66d075ba32baf55d512bd58f Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 30 Apr 2024 22:45:21 +0900 Subject: [PATCH] Fix undefined variables in layout admin view/model --- modules/layout/layout.admin.model.php | 7 +------ modules/layout/layout.admin.view.php | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/layout/layout.admin.model.php b/modules/layout/layout.admin.model.php index 94be7370e..ced111288 100644 --- a/modules/layout/layout.admin.model.php +++ b/modules/layout/layout.admin.model.php @@ -26,7 +26,7 @@ class LayoutAdminModel extends Layout $script = ''; $oTemplate = TemplateHandler::getInstance(); $html = $oTemplate->compile($this->module_path.'tpl/', 'layout_info_view'); - + $csss = ''; preg_match_all('//', $html, $m); $pluginList = $m[1]; @@ -49,11 +49,6 @@ class LayoutAdminModel extends Layout } $this->add('html', $csss . $script . $html); - - if($isReturn) - { - return $this->get('html'); - } } public function setLayoutAdminSetInfoView() diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php index 60b3d2cc9..26f532086 100644 --- a/modules/layout/layout.admin.view.php +++ b/modules/layout/layout.admin.view.php @@ -377,7 +377,7 @@ class LayoutAdminView extends Layout $faceoffcss = $oLayoutModel->_getUserLayoutFaceOffCss($current_module_info->layout_srl); $css = FileHandler::readFile($faceoffcss); - $match = null; + $style = []; preg_match_all('/([^\{]+)\{([^\}]*)\}/is',$css,$match); for($i=0,$c=count($match[1]);$i<$c;$i++) {