Bug 121601: Have logout display index.cgi, not just a message on relogin.cgi.

Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit

1 files changed, 1 insertions, 15 deletions

diff --git a/relogin.cgi b/relogin.cgi
index 9d30d7c11..a5cea5f91 100755
--- a/relogin.cgi
+++ b/relogin.cgi
@@ -37,7 +37,7 @@ use Date::Format;
 my $template = Bugzilla->template;
 my $cgi = Bugzilla->cgi;
 
-my $action = $cgi->param('action') || 'logout';
+my $action = $cgi->param('action');
 
 my $vars = {};
 my $target;
@@ -184,20 +184,6 @@ elsif ($action eq 'end-sudo') {
     $vars->{'message'} = 'sudo_ended';
     $target = 'global/message.html.tmpl';
 }
-# Log out the currently logged-in user (this used to be the only thing this did)
-elsif ($action eq 'logout') {
-    # We don't want to remove a random logincookie from the db, so
-    # call Bugzilla->login(). If we're logged in after this, then
-    # the logincookie must be correct
-    Bugzilla->login(LOGIN_OPTIONAL);
-
-    $cgi->remove_cookie('sudo');
-
-    Bugzilla->logout();
-
-    $vars->{'message'} = "logged_out";
-    $target = 'global/message.html.tmpl';
-}
 # No valid action found
 else {
     Bugzilla->login(LOGIN_OPTIONAL);