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

Conflicts:
	adm/board_list.php
	bbs/memo.php
	bbs/memo_form_update.php
	bbs/memo_view.php
	head.sub.php
This commit is contained in:
gnuboard
2013-01-18 10:04:16 +09:00
47 changed files with 743 additions and 534 deletions

View File

@ -2,7 +2,7 @@
include_once('./_common.php');
$g4['title'] = '로그인';
include_once('./_head.php');
include_once('./_head.sub.php');
$p = parse_url($url);
if ((isset($p['scheme']) && $p['scheme']) ||
@ -50,5 +50,5 @@ else
include_once($member_skin_path.'/login.skin.php');
include_once('./_tail.php');
include_once('./_tail.sub.php');
?>