From fb85d62f2fd1bf5f026c6ca1801f1d3805396e08 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 17 Jan 2024 14:49:36 +0900
Subject: [PATCH] Fix setLayoutAndTemplatePaths() no-op when PC layout is set
 to -1

---
 classes/module/ModuleObject.class.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index eb5e3f299..ab3fdfb60 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -601,6 +601,11 @@ class ModuleObject extends BaseObject
 		if ($type === 'P')
 		{
 			$layout_srl = $config->layout_srl ?? 0;
+			if ($layout_srl == -1)
+			{
+				$layout_srl = LayoutAdminModel::getInstance()->getSiteDefaultLayout('P');
+			}
+
 			if ($layout_srl > 0)
 			{
 				$layout_info = LayoutModel::getInstance()->getLayout($layout_srl);
@@ -627,11 +632,14 @@ class ModuleObject extends BaseObject
 				$layout_srl = LayoutAdminModel::getInstance()->getSiteDefaultLayout('M');
 			}
 
-			$layout_info = LayoutModel::getInstance()->getLayout($layout_srl);
-			if($layout_info)
+			if ($layout_srl > 0)
 			{
-				$this->module_info->mlayout_srl = $layout_srl;
-				$this->setLayoutPath($layout_info->path);
+				$layout_info = LayoutModel::getInstance()->getLayout($layout_srl);
+				if($layout_info)
+				{
+					$this->module_info->mlayout_srl = $layout_srl;
+					$this->setLayoutPath($layout_info->path);
+				}
 			}
 		}