From 97fc096fbdd96d8a613f24a5682f308b0a1076c2 Mon Sep 17 00:00:00 2001
From: Min-Soo Kim <misol.kr@gmail.com>
Date: Wed, 23 Dec 2020 21:57:56 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=AA=A8=EB=93=88?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B2=80=EC=83=89=EC=8B=9C=EC=97=90=20sea?=
 =?UTF-8?q?rch=20operator=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20(#1519)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 통합검색 모듈에서 검색어가 이중으로 escape 되는 문제 수정
* 파일 검색시에도 'search' operator 사용하도록 수정
* XML 쿼리 파일 내의 id가 실제 쿼리 id와 다르게 작성되어 있던 오타를 수정합니다.
---
 modules/file/file.admin.model.php                  | 1 -
 modules/file/queries/getFilesCountByGroupValid.xml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php
index b164d5458..89daed2bc 100644
--- a/modules/file/file.admin.model.php
+++ b/modules/file/file.admin.model.php
@@ -173,7 +173,6 @@ class fileAdminModel extends file
 			switch($search_target)
 			{
 				case 'filename' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
 					$args->s_filename = $search_keyword;
 					break;
 				case 'filesize_more' :
diff --git a/modules/file/queries/getFilesCountByGroupValid.xml b/modules/file/queries/getFilesCountByGroupValid.xml
index 869d7a3fd..509a4d0c6 100644
--- a/modules/file/queries/getFilesCountByGroupValid.xml
+++ b/modules/file/queries/getFilesCountByGroupValid.xml
@@ -1,4 +1,4 @@
-<query id="getFilesCount" action="select">
+<query id="getFilesCountByGroupValid" action="select">
     <tables>
         <table name="files" />
     </tables>
@@ -12,7 +12,7 @@
         <condition operation="equal" column="isvalid" var="isvalid" pipe="and" />
         <condition operation="equal" column="direct_download" var="direct_download" pipe="and" />
         <group pipe="and">
-            <condition operation="like" column="source_filename" var="s_filename" pipe="or" />
+            <condition operation="search" column="source_filename" var="s_filename" pipe="or" />
             <condition operation="more" column="file_size" var="s_filesize_more" pipe="or" />
             <condition operation="less" column="file_size" var="s_filesize_less" pipe="or" />
             <condition operation="more" column="download_count" var="s_download_count" pipe="or" />