From 4df36cbde7080a24a543643afbaab84e69765a82 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 26 Dec 2020 00:02:33 +0900
Subject: [PATCH] Fix double escape of search keyword in default board skins

---
 modules/board/m.skins/default/_list.html | 2 +-
 modules/board/skins/default/list.html    | 2 +-
 modules/board/skins/xedition/list.html   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/board/m.skins/default/_list.html b/modules/board/m.skins/default/_list.html
index 302ecde79..fd2662c6c 100644
--- a/modules/board/m.skins/default/_list.html
+++ b/modules/board/m.skins/default/_list.html
@@ -40,7 +40,7 @@
 			<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
 			<!--@end-->
 		</select>
-		<input type="search" name="search_keyword" value="{htmlspecialchars($search_keyword)}" title="{$lang->cmd_search}" />
+		<input type="search" name="search_keyword" value="{escape($search_keyword, false)}" title="{$lang->cmd_search}" />
 		<button type="submit" class="shbn" title="{$lang->cmd_search}"></button>
 	</form>
 </div>
diff --git a/modules/board/skins/default/list.html b/modules/board/skins/default/list.html
index 0c3a658db..46037890b 100644
--- a/modules/board/skins/default/list.html
+++ b/modules/board/skins/default/list.html
@@ -139,7 +139,7 @@
 		<input type="hidden" name="vid" value="{$vid}" />
 		<input type="hidden" name="mid" value="{$mid}" />
 		<input type="hidden" name="category" value="{$category}" />
-		<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" title="{$lang->cmd_search}" class="iText" />
+		<input type="text" name="search_keyword" value="{escape($search_keyword, false)}" title="{$lang->cmd_search}" class="iText" />
 		<select name="search_target">
 			<option loop="$search_option=>$key,$val" value="{$key}" selected="selected"|cond="$search_target==$key">{$val}</option>
 		</select>
diff --git a/modules/board/skins/xedition/list.html b/modules/board/skins/xedition/list.html
index 06b018b48..6230161a0 100644
--- a/modules/board/skins/xedition/list.html
+++ b/modules/board/skins/xedition/list.html
@@ -148,7 +148,7 @@
 		</select>
 		<div class="search_input">
 			<i class="xi-magnifier"></i>
-			<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" title="{$lang->cmd_search}" class="iText" />
+			<input type="text" name="search_keyword" value="{escape($search_keyword, false)}" title="{$lang->cmd_search}" class="iText" />
 		</div>
 		<button type="submit" class="btn" onclick="xGetElementById('board_search').submit();return false;">{$lang->cmd_search}</button>
         <a cond="$last_division" href="{getUrl('page',1,'document_srl','','division',$last_division,'last_division','')}" class="btn">{$lang->cmd_search_next}</a>