From e78189ea5c10bff5e2a78a527d03ed49a3b0e338 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 3 Dec 2017 22:23:48 +0900
Subject: [PATCH] Fix invisible message content on mobile default skin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 모바일에서 쪽지 본문이 보이지 않는 문제 수정
- 모바일 쪽지 기본 스킨에서 본문 아래에 목록을 표시하도록 수정
- 항상 Context::get('m') 변수를 사용할 수 있도록 수정
---
 classes/context/Context.class.php                       | 3 +++
 classes/display/HTMLDisplayHandler.php                  | 3 +--
 modules/communication/communication.view.php            | 2 +-
 modules/communication/m.skins/default/messages.html     | 2 +-
 modules/communication/m.skins/default/read_message.html | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index e73625dc4..de4abc56d 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -423,6 +423,9 @@ class Context
 		self::set('current_url', $current_url);
 		self::set('request_uri', $request_uri);
 		
+		// set mobile status
+		self::set('m', Mobile::isFromMobilePhone() ? 1 : 0);
+		
 		// If the site is locked, display the locked page.
 		if(config('lock.locked'))
 		{
diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index d812bfdfb..3e599c30e 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -237,9 +237,8 @@ class HTMLDisplayHandler
 
 		// convert the final layout
 		Context::set('content', $output);
-		Context::set('m', $is_mobile = Mobile::isFromMobilePhone() ? 1 : 0);
 		$oTemplate = TemplateHandler::getInstance();
-		if($is_mobile)
+		if(Mobile::isFromMobilePhone())
 		{
 			$this->_loadMobileJSCSS();
 		}
diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php
index c16f1f654..e447e8543 100644
--- a/modules/communication/communication.view.php
+++ b/modules/communication/communication.view.php
@@ -116,7 +116,7 @@ class communicationView extends communication
 			{
 				stripEmbedTagForAdmin($message->content, $message->sender_srl);
 				Context::set('message', $message);
-				if(Context::get('m'))
+				if(Mobile::isFromMobilePhone())
 				{
 					$template_filename = 'read_message';
 				}
diff --git a/modules/communication/m.skins/default/messages.html b/modules/communication/m.skins/default/messages.html
index 03461a365..19b20461c 100644
--- a/modules/communication/m.skins/default/messages.html
+++ b/modules/communication/m.skins/default/messages.html
@@ -1,6 +1,6 @@
 <load target="css/mcommunication.css" />
 <div class="hx h2">
-	<h2>{$lang->message_box[$message_type]}<a href="{getUrl('page','','act','dispCommunicationMessageBoxList','')}" class="ca">{$lang->cmd_message_box}</a></h2>
+	<h2>{$lang->message_box[$message_type]}<a href="{getUrl('page','','act','dispCommunicationMessageBoxList','message_srl','')}" class="ca">{$lang->cmd_message_box}</a></h2>
 </div>
 <ul class="lt">
 	<li loop="$message_list => $no,$val" class="read"|cond="$val->readed == 'Y'" class="unread"|cond="$val->readed != 'Y'">
diff --git a/modules/communication/m.skins/default/read_message.html b/modules/communication/m.skins/default/read_message.html
index 233e9fdf6..9a7d68407 100644
--- a/modules/communication/m.skins/default/read_message.html
+++ b/modules/communication/m.skins/default/read_message.html
@@ -15,3 +15,4 @@
 	var confirm_delete_msg = "{$lang->confirm_delete}";
 </script>
 
+<include target="messages.html" />