Do not fail to login back just after logging out (when ?logout=1 is still in URL)

template/en/default/account/auth/login-simple.html.tmpl

@@ -39,7 +39,7 @@
   <label for="Bugzilla_restrictlogin" title="Restrict this session to this IP address (using this option improves security)">Restrict to IP</label>
 
   [% PROCESS "global/hidden-fields.html.tmpl"
-     exclude="^Bugzilla_(login|password|restrictlogin)$" %]
+     exclude="^Bugzilla_(login|password|restrictlogin)$|^logout$|^GoAheadAndLogIn$" %]
 
   <input type="submit" name="GoAheadAndLogIn" value="Log in to [% terms.Bugzilla %]" id="log_in" />
 

template/en/default/account/auth/login-small.html.tmpl

@@ -41,9 +41,10 @@
 [%# Use the current script name. If an empty name is returned,
   # then we are accessing the home page. %]
 
+[% cgi.delete('logout') %]
 [% login_target = cgi.url("-relative" => 1, "-query" => 1) %]
 [% IF !login_target OR login_target.match("^token.cgi") %]
- [% login_target = "index.cgi" %]
+  [% login_target = "index.cgi" %]
 [% END %]
 
 [% login_target = urlbase _ login_target %]

template/en/default/account/auth/login.html.tmpl

@@ -77,7 +77,7 @@
   </table>
 
   [% PROCESS "global/hidden-fields.html.tmpl"
-     exclude="^Bugzilla_(login|password|restrictlogin)$" %]
+     exclude="^Bugzilla_(login|password|restrictlogin)$|^logout$|^GoAheadAndLogIn$" %]
 
   <input type="submit" name="GoAheadAndLogIn" value="Log in" id="log_in" />
   

template/en/default/global/hidden-fields.html.tmpl

@@ -27,7 +27,7 @@
 [% p = Bugzilla.input_params %]
 [% FOREACH field = p.keys %]
   [% NEXT IF exclude_hash && exclude_hash.$field %]
-  [% NEXT IF exclude && field.search(exclude) %]
+  [% NEXT IF exclude && field.match(exclude) %]
   [% IF blessed(p.$field) %]
     <div class="box">
       <p>