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

g5 merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2014-03-14 17:36:09 +09:00
parent ba5426cad5 3c3bfc2b8f
commit 5bb5ff396c
38 changed files with 1123 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
install/gnuboard5.sql
View File

@ -84,7 +84,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` (
`bo_upload_size` int(11) NOT NULL DEFAULT '0',
`bo_reply_order` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_search` tinyint(4) NOT NULL DEFAULT '0',
`bo_show_menu` tinyint(4) NOT NULL DEFAULT '0',
`bo_order` int(11) NOT NULL DEFAULT '0',
`bo_count_write` int(11) NOT NULL DEFAULT '0',
`bo_count_comment` int(11) NOT NULL DEFAULT '0',
@ -352,7 +351,6 @@ CREATE TABLE IF NOT EXISTS `g5_group` (
`gr_device` ENUM('both','pc','mobile') NOT NULL DEFAULT 'both',
`gr_admin` varchar(255) NOT NULL default '',
`gr_use_access` tinyint(4) NOT NULL default '0',
`gr_show_menu` tinyint(4) NOT NULL default '0',
`gr_order` int(11) NOT NULL default '0',
`gr_1_subj` varchar(255) NOT NULL default '',
`gr_2_subj` varchar(255) NOT NULL default '',
@ -836,6 +834,8 @@ CREATE TABLE IF NOT EXISTS `g5_faq_master` (
`fm_subject` varchar(255) NOT NULL DEFAULT '',
`fm_head_html` text NOT NULL,
`fm_tail_html` text NOT NULL,
`fm_mobile_head_html` text NOT NULL,
`fm_mobile_tail_html` text NOT NULL,
`fm_order` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`fm_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@ -865,3 +865,20 @@ CREATE TABLE IF NOT EXISTS `g5_new_win` (
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
-- Table structure for table `g5_menu`
--
DROP TABLE IF EXISTS `g5_menu`;
CREATE TABLE IF NOT EXISTS `g5_menu` (
`me_id` int(11) NOT NULL AUTO_INCREMENT,
`me_code` varchar(255) NOT NULL DEFAULT '',
`me_name` varchar(255) NOT NULL DEFAULT '',
`me_link` varchar(255) NOT NULL DEFAULT '',
`me_target` varchar(255) NOT NULL DEFAULT '',
`me_order` int(11) NOT NULL DEFAULT '0',
`me_use` tinyint(4) NOT NULL DEFAULT '0',
`me_mobile_use` tinyint(4) NOT NULL DEFAULT '0',
PRIMARY KEY (`me_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

2
install/install_db.php
View File

@ -144,6 +144,7 @@ if($g5_install || !$result) {
cf_mobile_search_skin = 'basic',
cf_mobile_connect_skin = 'basic',
cf_mobile_member_skin = 'basic',
cf_editor = 'ckeditor4',
cf_captcha_mp3 = 'basic',
cf_register_level = '2',
cf_register_point = '1000',
@ -510,6 +511,7 @@ fwrite($f, "\$g5['content_table'] = G5_TABLE_PREFIX.'content'; // 내용(컨텐
fwrite($f, "\$g5['faq_table'] = G5_TABLE_PREFIX.'faq'; // 자주하시는 질문 테이블\n");
fwrite($f, "\$g5['faq_master_table'] = G5_TABLE_PREFIX.'faq_master'; // 자주하시는 질문 마스터 테이블\n");
fwrite($f, "\$g5['new_win_table'] = G5_TABLE_PREFIX.'new_win'; // 새창 테이블\n");
fwrite($f, "\$g5['menu_table'] = G5_TABLE_PREFIX.'menu'; // 메뉴관리 테이블\n");
if($g5_shop_install) {
fwrite($f, "\n");