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:
gnuboard
2013-05-13 14:23:07 +09:00
parent f707e8152a c51c205324
commit ddbdbeea63
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/board.php
View File

@ -134,7 +134,7 @@ if (isset($wr_id) && $wr_id) {
if ($member['mb_id'])
alert('목록을 볼 권한이 없습니다.', G4_URL);
else
alert('목록을 볼 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?'.$qstr.'&url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&'.$qstr));
alert('목록을 볼 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?'.$qstr.'&url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.($qstr?'&':'')));
}
if (!isset($page) || (isset($page) && $page == 0)) $page = 1;

4
lib/common.lib.php
View File

@ -1987,8 +1987,12 @@ function hyphen_hp_number($hp)
function login_url($url='')
{
if (!$url) $url = G4_URL;
/*
$p = parse_url($url);
echo urlencode($_SERVER['REQUEST_URI']);
return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
*/
return $url;
}