firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

충돌 해결

Browse Source
This commit is contained in:
gnuboard
2013-11-08 16:16:06 +09:00
parent 1dcd9d375d
commit 5c2da8e6a1
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extend/shop.extend2.php
View File

@ -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
}
?>