From 84e36a3d1fea362f08865dd9be817ae16d1da382 Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com" <>
Date: Fri, 29 Dec 2006 00:48:06 +0000
Subject: Bug 276565 - ""Log In" link in footer should return to same page
after logging in." [p=reed r=justdave a=justdave]
---
template/en/default/global/common-links.html.tmpl | 25 ++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
(limited to 'template/en/default/global/common-links.html.tmpl')
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index 56de98ce2..dca5d7262 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -76,7 +76,30 @@
| New Account
[% END %]
[% IF user.authorizer.can_login %]
- | Log In
+ [%# Use the current script name. If an empty name is returned,
+ # then we are accessing the home page. %]
+
+ [% script_name = cgi.url(Relative => 1) %]
+
+ [% IF cgi.request_method == "POST" OR script_name.match("relogin") %]
+ [% script_name = "" %]
+ [% END %]
+
+ [%# If SSL is in use, use 'sslbase', else use 'urlbase'. %]
+ [% IF Param("sslbase") != "" && Param("ssl") != "never" %]
+ [% script_name = Param("sslbase") _ script_name %]
+ [% ELSE %]
+ [% script_name = Param("urlbase") _ script_name %]
+ [% END %]
+
+ [% IF cgi.request_method == "GET" AND cgi.query_string %]
+ [% script_name = script_name _ "?" _ cgi.query_string %]
+ [% script_name = script_name _ "&GoAheadAndLogIn=1" IF !cgi.query_string.match("GoAheadAndLogIn") %]
+ [% ELSE %]
+ [% script_name = script_name _ "?GoAheadAndLogIn=1" %]
+ [% END %]
+
+ | Log In
[% END %]
[% END %]
--
cgit v1.2.3-24-g4f1b