diff options
| -rw-r--r-- | Bugzilla/Auth/Login/WWW.pm | 1 | ||||
| -rw-r--r-- | template/en/default/account/created.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/useful-links.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/index.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/sidebar.xul.tmpl | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/Bugzilla/Auth/Login/WWW.pm b/Bugzilla/Auth/Login/WWW.pm index cc3ae25e2..f54e5760b 100644 --- a/Bugzilla/Auth/Login/WWW.pm +++ b/Bugzilla/Auth/Login/WWW.pm @@ -51,6 +51,7 @@ sub login { # (double cookies, odd compat code settings, etc) return $user if $user->id; + $type = LOGIN_REQUIRED if Bugzilla->cgi->param('GoAheadAndLogIn'); $type = LOGIN_NORMAL unless defined $type; # Log in using whatever methods are defined in user_info_class. diff --git a/template/en/default/account/created.html.tmpl b/template/en/default/account/created.html.tmpl index cbd1227b5..2d507b4cf 100644 --- a/template/en/default/account/created.html.tmpl +++ b/template/en/default/account/created.html.tmpl @@ -36,7 +36,7 @@ <p> When the e-mail arrives, - <a href="query.cgi?GoAheadAndLogIn=1">log in here</a>. + <a href="index.cgi?GoAheadAndLogIn=1">log in here</a>. </p> [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 5ed2eecf8..0ce65ef09 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -156,7 +156,7 @@ [% ELSIF message_tag == "logged_out" %] [% title = "Logged Out" %] - [% url = "query.cgi?GoAheadAndLogIn=1" %] + [% url = "index.cgi?GoAheadAndLogIn=1" %] [% link = "Log in again." %] <b>Your login has been forgotten</b>. The cookie that was remembering your login is now gone. You will be diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index 6d45bfd1b..36a08a8b8 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -63,7 +63,7 @@ [% IF Param('createemailregexp') %] | <a href="createaccount.cgi">New Account</a> [% END %] - | <a href="query.cgi?GoAheadAndLogIn=1">Log In</a> + | <a href="index.cgi?GoAheadAndLogIn=1">Log In</a> [% END %] </div> </div> diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index c45ed9cc8..c1bdf62c5 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -72,7 +72,7 @@ function addSidebar() { <li id="logout"><a href="relogin.cgi">Logout [% user.login FILTER html %]</a></li> [% END %] [% ELSE %] - <li id="login"><a href="query.cgi?GoAheadAndLogIn=1">Log in to an existing account</a></li> + <li id="login"><a href="index.cgi?GoAheadAndLogIn=1">Log in to an existing account</a></li> [% IF Param('createemailregexp') %] <li id="account"><a href="createaccount.cgi">Open a new [% terms.Bugzilla %] account</a></li> [% END %] diff --git a/template/en/default/sidebar.xul.tmpl b/template/en/default/sidebar.xul.tmpl index f510206d9..b285cac56 100644 --- a/template/en/default/sidebar.xul.tmpl +++ b/template/en/default/sidebar.xul.tmpl @@ -113,7 +113,7 @@ function normal_keypress_handler( aEvent ) { [% ELSE %] <text class="text-link" onclick="load_relative_url('createaccount.cgi')" value="new user"/> - <text class="text-link" onclick="load_relative_url('query.cgi?GoAheadAndLogIn=1')" value="log in"/> + <text class="text-link" onclick="load_relative_url('index.cgi?GoAheadAndLogIn=1')" value="log in"/> [% END %] </box> |