g5 merge 충돌 수정

2014-03-21 10:21:17 +09:00
parent bbc71a0bb6 1e84bc6f1d
commit a8b82fa900
7 changed files with 29 additions and 10 deletions
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@ -269,6 +269,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
  `cf_movie_extension` varchar(255) NOT NULL DEFAULT '',
  `cf_formmail_is_member` tinyint(4) NOT NULL DEFAULT '0',
  `cf_page_rows` int(11) NOT NULL DEFAULT '0',
+  `cf_mobile_page_rows` int(11) NOT NULL DEFAULT '0',
  `cf_visit` varchar(255) NOT NULL DEFAULT '',
  `cf_max_po_id` int(11) NOT NULL DEFAULT '0',
  `cf_stipulation` text NOT NULL,
--- a/install/install_db.php
+++ b/install/install_db.php
@ -170,6 +170,7 @@ if($g5_install || !$result) {
                    cf_movie_extension = 'asx|asf|wmv|wma|mpg|mpeg|mov|avi|mp3',
                    cf_formmail_is_member = '1',
                    cf_page_rows = '15',
+                    cf_page_rows = '15',
                    cf_cert_limit = '2',
                    cf_stipulation = '해당 홈페이지에 맞는 회원가입약관을 입력합니다.',
                    cf_privacy = '해당 홈페이지에 맞는 개인정보처리방침을 입력합니다.'