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
2013-09-13 15:22:15 +09:00
parent 0f78b67eb7 5d332663d6
commit 8c0d61e772
55 changed files with 818 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
adm/board_form.php
View File

@ -123,7 +123,6 @@ if ($w == '') {
$board['bo_include_head'] = '_head.php';
$board['bo_include_tail'] = '_tail.php';
$board['bo_show_menu'] = true;
$board['bo_use_cert'] = 'none';
} else if ($w == 'u') {

2
adm/board_form_update.php
View File

@ -175,7 +175,7 @@ if ($w == '') {
// 글수 조정
/*
엔피씨님의 팁으로 교체합니다. 130308
http://sir.co.kr/bbs/board.php?bo_table=g4_tiptech&wr_id=27207
http://sir.co.kr/bbs/board.php?bo_table=g5_tiptech&wr_id=27207
*/
if (isset($_POST['proc_count'])) {
// 원글을 얻습니다.

4
adm/board_list.php
View File

@ -53,7 +53,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
$g5['title'] = '게시판관리';
include_once('./admin.head.php');
$colspan = 15;
$colspan = 16;
?>
<form name="fsearch" id="fsearch" method="get">
@ -172,7 +172,7 @@ $colspan = 15;
<option value="mobile"<?php echo get_selected($row['bo_device'], 'mobile'); ?>>모바일</option>
</select>
</td>
<td class="td_smallmng"><?php echo $one_update ?> <?php echo $one_copy ?></td>
<td><?php echo $one_update ?> <?php echo $one_copy ?></td>
</tr>
<?php
}

2
adm/boardgroup_list.php
View File

@ -57,7 +57,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
$g5['title'] = '게시판그룹설정';
include_once('./admin.head.php');
$colspan = 8;
$colspan = 11;
?>
<form id="fsearch" name="fsearch" method="get">

2
adm/mail_preview.php
View File

@ -15,7 +15,7 @@ $content = $se['ma_content'] . "<hr size=0><p><span style='font-size:9pt; font-f
<html lang="ko">
<head>
<meta charset="utf-8">
<title>그누보드 메일발송 테스트</title>
<title><?php echo G5_VERSION ?> 메일발송 테스트</title>
</head>
<body>

2
adm/mail_select_list.php
View File

@ -106,7 +106,7 @@ include_once('./admin.head.php');
<?php } ?>
</tbody>
</table>
<textarea name="ma_list" style="display:none"><?php echo $ma_list; ?></textarea>
<textarea name="ma_list" style="display:none"><?=$ma_list?></textarea>
</div>
<div class="btn_confirm">

2
adm/poll_list.php
View File

@ -51,7 +51,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
$g5['title'] = '투표관리';
include_once('./admin.head.php');
$colspan = 6;
$colspan = 7;
?>
<form id="fsearch" name="fsearch" method="get">