From 792a6b731be163bdb2313527beb62056fc428412 Mon Sep 17 00:00:00 2001
From: BJRambo <sosifam@070805.co.kr>
Date: Mon, 8 Aug 2016 21:23:15 +0900
Subject: [PATCH] =?UTF-8?q?=ED=83=9C=EB=B8=94=EB=A6=BF=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=EC=97=AC=EB=B6=80=EC=99=80=20=EC=83=81=EA=B4=80?=
 =?UTF-8?q?=EC=97=86=EC=9D=B4=20=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=B5=9C?=
 =?UTF-8?q?=EC=A0=81=ED=99=94=20=EB=B2=84=ED=8A=BC=EC=9D=B4=20=EB=9C=A8?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EA=B3=A0=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/module/ModuleHandler.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index f411d65f1..f56c1e2b4 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -780,7 +780,9 @@ class ModuleHandler extends Handler
 				'dispLayoutPreviewWithModule' => 1
 		);
 		$db_use_mobile = Mobile::isMobileEnabled();
-		if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent() && !isset($skipAct[Context::get('act')]) && $db_use_mobile === true)
+		$tablet_use = Rhymix\Framework\UA::isTablet();
+		$config_talbet_use = config('mobile.tablets');
+		if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent() && !isset($skipAct[Context::get('act')]) && $db_use_mobile === true && ($tablet_use === true && $config_talbet_use === false) === false)
 		{
 			global $lang;
 			$header = '<style>div.xe_mobile{opacity:0.7;margin:1em 0;padding:.5em;background:#333;border:1px solid #666;border-left:0;border-right:0}p.xe_mobile{text-align:center;margin:1em 0}a.xe_mobile{color:#ff0;font-weight:bold;font-size:24px}@media only screen and (min-width:500px){a.xe_mobile{font-size:15px}}</style>';