From 56fbb935796b51cd715e07c2785f2cd38539af2a Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <pitrou@free.fr>
Date: Fri, 16 Aug 2002 15:09:20 +0000
Subject: [PATCH] ne pas utiliser request_uri

---
 ecrire/inc_auth.php3 | 3 ++-
 spip_cookie.php3     | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ecrire/inc_auth.php3 b/ecrire/inc_auth.php3
index 437c328ece..453c75c626 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 a0354e7954..b81fb7c250 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());
 
-- 
GitLab