bug de var_login=-1

formulaire_login-dist.html

@@ -31,7 +31,7 @@
 <div>
 			<input type="hidden" name="session_login_hidden" value="(#HTTP_VARS{login})" />
 <script type="text/javascript"><!--
-document.write("<:login_login:>&nbsp;<b>[(#HTTP_VARS{login})]<" + "/b><br />&#91;<a href='spip_cookie.php3?cookie_admin=non&amp;url=[(#HTTP_VARS{url})]'><font size='2'><:login_autre_identifiant:><" + "/font><" + "/a>&#93;")
+document.write("<:login_login:>&nbsp;<b>[(#HTTP_VARS{login})]<" + "/b><br />&#91;<a href='spip_cookie.php3?cookie_admin=non&amp;url=[(#HTTP_VARS{url})][&amp;retour=(#SELF|urlencode)]'><font size='2'><:login_autre_identifiant:><" + "/font><" + "/a>&#93;")
 //--></script>
 <noscript>
 	<font face="Georgia, Garamond, Times, serif" size="3">

spip_cookie.php3

@@ -143,8 +143,9 @@ if ($essai_login == "oui") {
 
 // cookie d'admin ?
 if ($cookie_admin == "non") {
+	if (!$retour) $retour = 'spip_login.php3?var_url='.urlencode($url);
 	spip_setcookie('spip_admin', $spip_admin, time() - 3600 * 24);
-	$redirect = ereg_replace("[?&]var_login=[^&]*", '', $redirect);
+	$redirect = ereg_replace("[?&]var_login=[^&]*", '', $retour);
 	$redirect .= (strpos($redirect, "?") ? "&" : "?") . "var_login=-1";
 }
 else if ($cookie_admin AND $spip_admin != $cookie_admin) {