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

This commit is contained in:
chicpro
2013-09-13 17:02:23 +09:00
6 changed files with 7 additions and 10 deletions

6
.gitignore vendored
View File

@ -1,5 +1,5 @@
.htaccess
data
/.htaccess
data/
test
config.php
sirgle
@ -13,4 +13,4 @@ itzimara*
nemoluv*
cheditor*
*.key
*.sh
*.sh

View File

@ -1,4 +0,0 @@
g5
==
그누보드5 개발자 버전

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">

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">

1
extend/.htaccess Normal file
View File

@ -0,0 +1 @@
# .htaccess

View File

@ -6,8 +6,8 @@ header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
header('Pragma: no-cache'); // HTTP/1.0
$title = G5_VERSION." 설치 3단계 중 2단계 설정";
include_once ('../config.php');
$title = G5_VERSION." 설치 3단계 중 2단계 설정";
include_once ('./install.inc.php');
if (isset($_POST['agree']) && $_POST['agree'] != '동의함') {