summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2010-09-23 20:34:59 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2010-09-23 20:34:59 +0200
commit6129e24c24e9f69265bef7569bee669ac77a5f1a (patch)
treef166c2bfa52bb2d613606801cffa467e222aa6a7 /template
parentb4baeb2af8f99cdeb04f0a6b86a2a27bf04a9f1f (diff)
downloadbugzilla-6129e24c24e9f69265bef7569bee669ac77a5f1a.tar.gz
bugzilla-6129e24c24e9f69265bef7569bee669ac77a5f1a.tar.xz
Bug 595712: Return to bug page after login doesn't work with javascript disabled
r=ghendricks a=LpSolit
Diffstat (limited to 'template')
-rw-r--r--template/en/default/account/auth/login-small.html.tmpl9
1 files changed, 7 insertions, 2 deletions
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index 41c0881d2..a7e72eaf1 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -32,7 +32,12 @@
<li id="mini_login_container[% qs_suffix %]">
<span class="separator">| </span>
- <a id="login_link[% qs_suffix %]" href="?GoAheadAndLogIn=1"
+ [% connector = "?" %]
+ [% IF cgi.request_method == "GET" AND cgi.query_string %]
+ [% connector = "&" %]
+ [% END %]
+ [% script_name = login_target _ connector _ "GoAheadAndLogIn=1" %]
+ <a id="login_link[% qs_suffix %]" href="[% script_name FILTER html %]"
onclick="return show_mini_login_form('[% qs_suffix %]')">Log In</a>
<form action="[% login_target FILTER html %]" method="POST"
class="mini_login bz_default_hidden"
@@ -103,7 +108,7 @@
</li>
<li id="forgot_container[% qs_suffix %]">
<span class="separator">| </span>
- <a id="forgot_link[% qs_suffix %]" href="?GoAheadAndLogIn=1#forgot"
+ <a id="forgot_link[% qs_suffix %]" href="[% script_name FILTER html %]#forgot"
onclick="return show_forgot_form('[% qs_suffix %]')">Forgot Password</a>
<form action="token.cgi" method="post" id="forgot_form[% qs_suffix %]"
class="mini_forgot bz_default_hidden">