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

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source
This commit is contained in:
whitedot
2013-03-04 14:17:26 +09:00
parent 95819c7629 0f47a866e9
commit d7ac67271d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bbs/write.php
View File

@ -31,7 +31,7 @@ if (($w == 'u' || $w == 'r') && !$write['wr_id']) {
if ($w == '') {
if ($wr_id) {
alert('글쓰기에는 \$wr_id 값을 사용하지 않습니다.', $g4['bbs_path'].'/board.php?bo_table='.$bo_table);
alert('글쓰기에는 \$wr_id 값을 사용하지 않습니다.', G4_BBS_URL.'/board.php?bo_table='.$bo_table);
}
if ($member['mb_level'] < $board['bo_write_level']) {
@ -203,7 +203,6 @@ if ($member['mb_level'] >= $board['bo_html_level'])
$is_secret = $board['bo_use_secret'];
$is_dhtml_editor = false;
$editor_html = editor_html('wr_content', $content, $is_dhtml_editor);
$editor_js = '';
// 모바일에서는 DHTML 에디터 사용불가
if (!G4_IS_MOBILE && $board['bo_use_dhtml_editor'] && $member['mb_level'] >= $board['bo_html_level']) {
@ -211,6 +210,7 @@ if (!G4_IS_MOBILE && $board['bo_use_dhtml_editor'] && $member['mb_level'] >= $bo
$editor_js .= get_editor_js('wr_content', $is_dhtml_editor);
$editor_js .= chk_editor_js('wr_content', $is_dhtml_editor);
}
$editor_html = editor_html('wr_content', $content, $is_dhtml_editor);
$is_mail = false;
if ($config['cf_email_use'] && $board['bo_use_email'])

4
install/gnuboard4s.sql
View File

@ -180,6 +180,10 @@ DROP TABLE IF EXISTS `g4s_config`;
CREATE TABLE IF NOT EXISTS `g4s_config` (
`cf_title` varchar(255) NOT NULL default '',
`cf_admin` 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 '',
`cf_add_script` text NOT NULL default '',
`cf_include_head` varchar(255) NOT NULL default '',
`cf_include_tail` varchar(255) NOT NULL default '',
`cf_add_script` text NOT NULL default '',