Merge branch 'g4s'

Conflicts:
	css/admin.css
This commit is contained in:
chicpro
2013-05-03 18:01:15 +09:00
25 changed files with 339 additions and 227 deletions

View File

@ -15,11 +15,11 @@ else {
// 현재 접속자
// 게시판 제목에 ' 포함되면 오류 발생
$lo_location = addslashes($g4['title']);
if (!$lo_location)
$lo_location = $_SERVER['REQUEST_URI'];
$lo_url = $_SERVER['REQUEST_URI'];
if (strstr($lo_url, '/'.G4_ADMIN_DIR.'/') || $is_admin == 'super') $lo_url = '';
$g4['lo_location'] = addslashes($g4['title']);
if (!$g4['lo_location'])
$g4['lo_location'] = $_SERVER['REQUEST_URI'];
$g4['lo_url'] = $_SERVER['REQUEST_URI'];
if (strstr($g4['lo_url'], '/'.G4_ADMIN_DIR.'/') || $is_admin == 'super') $g4['lo_url'] = '';
/*
// 만료된 페이지로 사용하시는 경우