From: Byron Jones <bjones@mozilla.com>
Date: Wed, 29 Aug 2012 04:59:26 +0000 (+0800)
Subject: Fix more bustage caused by Bug 772953
X-Git-Tag: bugzilla-4.2.3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98954571ac9cdc3d25ae626bde4ef8c1a18b9811;p=thirdparty%2Fbugzilla.git

Fix more bustage caused by Bug 772953
---

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index d58b190889..7135f7c48a 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -169,10 +169,12 @@ sub clean_search_url {
     # Delete leftovers from the login form
     $self->delete('Bugzilla_remember', 'GoAheadAndLogIn');
 
-    # Delete the token if we're not updating the defaults
-    unless (defined $self->param('remtype')
-            && ($self->param('remtype') eq 'asdefault'
-                || $self->param('remtype') eq 'asnamed'))
+    # Delete the token if we're not performing an action which needs it
+    unless ((defined $self->param('remtype')
+             && ($self->param('remtype') eq 'asdefault'
+                 || $self->param('remtype') eq 'asnamed'))
+            || (defined $self->param('remaction')
+                && $self->param('remaction') eq 'forget'))
     {
         $self->delete("token");
     }