From 15b4782d536920f7d66879b1d9077f23ac53d823 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 1 Jul 2017 21:13:33 +0900
Subject: [PATCH] Include PC layouts in mobile layout list

---
 modules/layout/layout.model.php          | 4 ++--
 modules/layout/queries/getLayoutList.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index fa5a4c653..beb40d12e 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -134,7 +134,7 @@ class layoutModel extends layout
 		}
 		$args = new stdClass();
 		$args->site_srl = $siteSrl;
-		$args->layout_type = $layoutType;
+		$args->layout_type = $layoutType === 'P' ? 'P' : 'P,M';
 		$args->layout = $layout;
 		$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
 
@@ -144,7 +144,7 @@ class layoutModel extends layout
 		{
 			foreach($output->data as $no => $iInfo)
 			{
-				if($this->isExistsLayoutFile($iInfo->layout, $layoutType))
+				if($this->isExistsLayoutFile($iInfo->layout, $iInfo->layout_type))
 				{
 					$instanceList[] = $iInfo->layout;
 				}
diff --git a/modules/layout/queries/getLayoutList.xml b/modules/layout/queries/getLayoutList.xml
index 612762ab2..7695c19af 100644
--- a/modules/layout/queries/getLayoutList.xml
+++ b/modules/layout/queries/getLayoutList.xml
@@ -7,7 +7,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="site_srl" var="site_srl" filter="number" default="0" notnull="notnull" />
-        <condition operation="equal" column="layout_type" var="layout_type" default="P" pipe="and" />
+        <condition operation="in" column="layout_type" var="layout_type" default="P" pipe="and" />
 		<condition operation="equal" column="layout" var="layout" pipe="and" />
     </conditions>
     <navigation>