From b8dffbd9b87f02b163e5e1ebe10ce6d765c8b522 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Nov 2013 11:59:22 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EA=B4=80=EB=A0=A8=EC=83=81=ED=92=88=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/shop.extend2.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 90a62eff5..e76513d21 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -654,4 +654,18 @@ if(!sql_query(" select it_explan2 from {$g5['g5_shop_item_table']} limit 1 ", fa
     sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}`
                     ADD `it_explan2` MEDIUMTEXT NOT NULL AFTER `it_explan` ", true);
 }
+
+
+// 관련상품 출력과 상품검색을 위한 설정 필드 추가
+if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}`
+                    ADD `de_rel_list_use` TINYINT NOT NULL AFTER `de_mobile_type5_img_height`,
+                    ADD `de_rel_list_skin` VARCHAR(255) NOT NULL AFTER `de_rel_list_use`,
+                    ADD `de_search_list_skin` VARCHAR(255) NOT NULL AFTER `de_rel_img_height`,
+                    ADD `de_search_list_mod` INT NOT NULL AFTER `de_search_list_skin`,
+                    ADD `de_search_list_row` INT NOT NULL AFTER `de_search_list_mod`,
+                    ADD `de_search_img_width` INT NOT NULL AFTER `de_search_list_row`,
+                    ADD `de_search_img_height` INT NOT NULL AFTER `de_search_img_width`
+              ", true);
+}
 ?>

From 93bc1b3a5e3943f07492456ccd8d0c153fae07f6 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Nov 2013 11:59:52 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EC=83=81=ED=92=88=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=EC=88=9C=20=ED=95=98=EC=9D=B4=ED=8D=BC=EB=A7=81=ED=81=AC=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/search.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/shop/search.php b/shop/search.php
index c36504002..58db51713 100644
--- a/shop/search.php
+++ b/shop/search.php
@@ -88,7 +88,12 @@ $total_count = $row['cnt'];
 <!-- 검색결과 시작 { -->
 <div id="ssch">
 
-    <div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div>
+    <!-- <div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div> -->
+    <a href="#">판매량 많은순</a>
+    <a href="#">선호도 높은순</a>
+    <a href="#">사용후기 많은순</a>
+    <a href="#">최근 등록순</a>
+    검색 결과 <strong><?php echo $total_count; ?></strong>건
 
     <div>
         <?php

From 5c2da8e6a128d8104451f49af2d6d88d3d48d638 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 8 Nov 2013 16:16:06 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/shop.extend2.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 6dba03374..d8b5093e2 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -655,20 +655,6 @@ if(!sql_query(" select it_explan2 from {$g5['g5_shop_item_table']} limit 1 ", fa
                     ADD `it_explan2` MEDIUMTEXT NOT NULL AFTER `it_explan` ", true);
 }
 
-<<<<<<< HEAD
-
-// 관련상품 출력과 상품검색을 위한 설정 필드 추가
-if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} limit 1 ", false)) {
-    sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}`
-                    ADD `de_rel_list_use` TINYINT NOT NULL AFTER `de_mobile_type5_img_height`,
-                    ADD `de_rel_list_skin` VARCHAR(255) NOT NULL AFTER `de_rel_list_use`,
-                    ADD `de_search_list_skin` VARCHAR(255) NOT NULL AFTER `de_rel_img_height`,
-                    ADD `de_search_list_mod` INT NOT NULL AFTER `de_search_list_skin`,
-                    ADD `de_search_list_row` INT NOT NULL AFTER `de_search_list_mod`,
-                    ADD `de_search_img_width` INT NOT NULL AFTER `de_search_list_row`,
-                    ADD `de_search_img_height` INT NOT NULL AFTER `de_search_img_width`
-              ", true);
-=======
 // de_rel_list_use 추가
 if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} ", false)) {
     sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
@@ -685,6 +671,5 @@ if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} ", fa
 if(!sql_query(" select de_item_use_write from {$g5['g5_shop_default_table']} ", false)) {
     sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
                     ADD `de_item_use_write` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_item_use_use` ", true);
->>>>>>> 23fe590917161cae409fb47b3b92131921dd5c97
 }
 ?>