merge 충돌 수정

2013-05-13 18:35:48 +09:00
parent 6f1a1fe673 0a65cb82c4
commit a857025b28
9 changed files with 36 additions and 24 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -1987,8 +1987,16 @@ function hyphen_hp_number($hp)
 function login_url($url='')
 {
    if (!$url) $url = G4_URL;
+<<<<<<< HEAD
    //$p = parse_url($url);
    //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;
 }