diff --git a/ecrire/inc_auth.php3 b/ecrire/inc_auth.php3 index 437c328ece0b95f1300f966cb08a058a496e4eb0..453c75c626f295ee9516332dd2d9d4fc59c0bccd 100644 --- a/ecrire/inc_auth.php3 +++ b/ecrire/inc_auth.php3 @@ -48,6 +48,7 @@ function auth() { global $connect_statut, $connect_toutes_rubriques, $connect_id_rubrique; global $auteur_session, $prefs; + global $this_link; // // Si pas MySQL, fini @@ -118,7 +119,7 @@ function auth() { // Si pas authentifie, demander login / mdp if (!$auth_login) { - $url = urlencode($GLOBALS['REQUEST_URI']); + $url = 'ecrire/'.$this_link->getUrl(); @header("Location: ../spip_login.php3?var_url=$url"); exit; } diff --git a/spip_cookie.php3 b/spip_cookie.php3 index a0354e795496458cd48697f9b46f407361189414..b81fb7c250dcb08b465c8bd3a93c780af58f7353 100644 --- a/spip_cookie.php3 +++ b/spip_cookie.php3 @@ -8,7 +8,7 @@ include_ecrire ("inc_session.php3"); if ($url) $cible = new Link($url); else - $cible = new Link('./ecrire/'); + $cible = new Link('ecrire/'); // rejoue le cookie pour renouveler spip_session if ($change_session == 'oui') { @@ -128,9 +128,6 @@ else if ($cookie_admin AND $spip_admin != $cookie_admin) { if ($cookie_session) setcookie('spip_session', $cookie_session); -/*echo $cible->getUrl()."<p>"; -exit;*/ - // redirection @header("Location: " . $cible->getUrl());