firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g4s 머지 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-13 18:41:04 +09:00
parent a5d534a412
commit ea58637d61
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/common.lib.php
View File

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