From f9b82cfbfb737635fa7575e29024cb33d6c114a3 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Mon, 5 Feb 2018 17:05:11 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EC=A3=BC?=
 =?UTF-8?q?=EC=84=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/skin/board/basic/view.skin.php               | 2 +-
 mobile/skin/board/gallery/view.skin.php             | 2 +-
 skin/board/basic/view.skin.php                      | 2 +-
 skin/board/gallery/view.skin.php                    | 2 +-
 theme/basic/mobile/skin/board/basic/view.skin.php   | 2 +-
 theme/basic/mobile/skin/board/gallery/view.skin.php | 2 +-
 theme/basic/skin/board/basic/view.skin.php          | 2 +-
 theme/basic/skin/board/gallery/view.skin.php        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php
index fe4cd096e..daa532271 100644
--- a/mobile/skin/board/basic/view.skin.php
+++ b/mobile/skin/board/basic/view.skin.php
@@ -141,7 +141,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
 
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>
 
diff --git a/mobile/skin/board/gallery/view.skin.php b/mobile/skin/board/gallery/view.skin.php
index ae09a062f..c55789bdd 100644
--- a/mobile/skin/board/gallery/view.skin.php
+++ b/mobile/skin/board/gallery/view.skin.php
@@ -141,7 +141,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
 
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>
 
diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php
index 7670a331c..741c830df 100644
--- a/skin/board/basic/view.skin.php
+++ b/skin/board/basic/view.skin.php
@@ -149,7 +149,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <!-- 본문 내용 시작 { -->
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
         <!-- } 본문 내용 끝 -->
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>
diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php
index 7670a331c..741c830df 100644
--- a/skin/board/gallery/view.skin.php
+++ b/skin/board/gallery/view.skin.php
@@ -149,7 +149,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <!-- 본문 내용 시작 { -->
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
         <!-- } 본문 내용 끝 -->
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>
diff --git a/theme/basic/mobile/skin/board/basic/view.skin.php b/theme/basic/mobile/skin/board/basic/view.skin.php
index e93963c8b..d8f85841d 100644
--- a/theme/basic/mobile/skin/board/basic/view.skin.php
+++ b/theme/basic/mobile/skin/board/basic/view.skin.php
@@ -141,7 +141,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
 
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>
 
diff --git a/theme/basic/mobile/skin/board/gallery/view.skin.php b/theme/basic/mobile/skin/board/gallery/view.skin.php
index 2d629ef51..3aba3abcf 100644
--- a/theme/basic/mobile/skin/board/gallery/view.skin.php
+++ b/theme/basic/mobile/skin/board/gallery/view.skin.php
@@ -141,7 +141,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
          ?>
 
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>
 
diff --git a/theme/basic/skin/board/basic/view.skin.php b/theme/basic/skin/board/basic/view.skin.php
index 7f53d70d7..82225527e 100644
--- a/theme/basic/skin/board/basic/view.skin.php
+++ b/theme/basic/skin/board/basic/view.skin.php
@@ -149,7 +149,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <!-- 본문 내용 시작 { -->
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
         <!-- } 본문 내용 끝 -->
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>
diff --git a/theme/basic/skin/board/gallery/view.skin.php b/theme/basic/skin/board/gallery/view.skin.php
index 7f53d70d7..82225527e 100644
--- a/theme/basic/skin/board/gallery/view.skin.php
+++ b/theme/basic/skin/board/gallery/view.skin.php
@@ -149,7 +149,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 
         <!-- 본문 내용 시작 { -->
         <div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
-        <?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
+        <?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
         <!-- } 본문 내용 끝 -->
 
         <?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>

From 58aaef82614772868f02444f2cef1a281fa912b7 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 14 Feb 2018 11:50:40 +0900
Subject: [PATCH 2/2] =?UTF-8?q?TEXTAREA=20=EB=A1=9C=20=EC=9E=91=EC=84=B1?=
 =?UTF-8?q?=EB=90=9C=20=EA=B8=80=EC=9D=84=20=EC=97=90=EB=94=94=ED=84=B0?=
 =?UTF-8?q?=EB=A1=9C=20=EA=B8=80=20=EC=88=98=EC=A0=95=EC=8B=9C=20=EC=83=9D?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin/editor/cheditor5/editor.lib.php    | 10 ++++++++--
 plugin/editor/smarteditor2/editor.lib.php | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/plugin/editor/cheditor5/editor.lib.php b/plugin/editor/cheditor5/editor.lib.php
index 1bd4df6a4..bb91e300b 100644
--- a/plugin/editor/cheditor5/editor.lib.php
+++ b/plugin/editor/cheditor5/editor.lib.php
@@ -3,11 +3,17 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 function editor_html($id, $content, $is_dhtml_editor=true)
 {
-    global $config, $w, $board;
+    global $config, $w, $board, $write;
     global $editor_width, $editor_height;
     static $js = true;
 
-    if( $is_dhtml_editor && $content && !$w && (isset($board['bo_insert_content']) && !empty($board['bo_insert_content']) ) ){       //글쓰기 기본 내용 처리
+    if( 
+        $is_dhtml_editor && $content && 
+        (
+        (!$w && (isset($board['bo_insert_content']) && !empty($board['bo_insert_content'])))
+        || ($w == 'u' && isset($write['wr_option']) && strpos($write['wr_option'], 'html') === false )
+        )
+    ){       //글쓰기 기본 내용 처리
         if( preg_match('/\r|\n/', $content) && $content === strip_tags($content, '<a><strong><b>') ) {  //textarea로 작성되고, html 내용이 없다면
             $content = nl2br($content);
         }
diff --git a/plugin/editor/smarteditor2/editor.lib.php b/plugin/editor/smarteditor2/editor.lib.php
index d77d75a39..ef11fd9e1 100644
--- a/plugin/editor/smarteditor2/editor.lib.php
+++ b/plugin/editor/smarteditor2/editor.lib.php
@@ -3,10 +3,16 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 function editor_html($id, $content, $is_dhtml_editor=true)
 {
-    global $g5, $config, $w, $board;
+    global $g5, $config, $w, $board, $write;
     static $js = true;
 
-    if( $is_dhtml_editor && $content && !$w && (isset($board['bo_insert_content']) && !empty($board['bo_insert_content']) ) ){       //글쓰기 기본 내용 처리
+    if( 
+        $is_dhtml_editor && $content && 
+        (
+        (!$w && (isset($board['bo_insert_content']) && !empty($board['bo_insert_content'])))
+        || ($w == 'u' && isset($write['wr_option']) && strpos($write['wr_option'], 'html') === false )
+        )
+    ){       //글쓰기 기본 내용 처리
         if( preg_match('/\r|\n/', $content) && $content === strip_tags($content, '<a><strong><b>') ) {  //textarea로 작성되고, html 내용이 없다면
             $content = nl2br($content);
         }