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-05-29 10:25:46 +09:00
parent aaeb725145 38f209a57d
commit 40b48e92b9
9 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
install/gnuboard5.sql
View File

@ -187,6 +187,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_title` varchar(255) NOT NULL DEFAULT '',
`cf_admin` varchar(255) NOT NULL DEFAULT '',
`cf_admin_email` varchar(255) NOT NULL DEFAULT '',
`cf_admin_email_name` varchar(255) NOT NULL DEFAULT '',
`cf_include_index` varchar(255) NOT NULL DEFAULT '',
`cf_include_head` varchar(255) NOT NULL DEFAULT '',
`cf_include_tail` varchar(255) NOT NULL DEFAULT '',

1
install/install_db.php
View File

@ -117,6 +117,7 @@ if($g5_install || !$result) {
set cf_title = '".G5_VERSION."',
cf_admin = '$admin_id',
cf_admin_email = '$admin_email',
cf_admin_email_name = '".G5_VERSION."',
cf_use_point = '1',
cf_use_copy_log = '1',
cf_login_point = '100',