From 60900705412d6512db3eb8bae39da50fc5400a7d Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Sun, 1 Mar 2009 23:42:51 +0000
Subject: 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

---
 template/en/default/global/common-links.html.tmpl | 2 +-
 template/en/default/sidebar.xul.tmpl              | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index 6f2c46f46..5c4e9d9a5 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -68,7 +68,7 @@
     <li>
       <span class="separator">| </span>
       [% IF user.authorizer.can_logout %]
-        <a href="relogin.cgi">Log&nbsp;out</a>
+        <a href="index.cgi?logout=1">Log&nbsp;out</a>
       [% ELSE %]
         Logged&nbsp;in&nbsp;as
       [% END %]
diff --git a/template/en/default/sidebar.xul.tmpl b/template/en/default/sidebar.xul.tmpl
index 8035c8298..3df943e5c 100644
--- a/template/en/default/sidebar.xul.tmpl
+++ b/template/en/default/sidebar.xul.tmpl
@@ -97,7 +97,8 @@ function normal_keypress_handler( aEvent ) {
       <text class="text-link" onclick="load_relative_url('sanitycheck.cgi')" value="sanity check"/>
   [%- END %]
   [%- IF user.authorizer.can_logout %]
-      <text class="text-link" onclick="load_relative_url('relogin.cgi')" value="log out [% user.login FILTER html %]"/>
+      <text class="text-link" onclick="load_relative_url('index.cgi?logout=1')"
+            value="log out [% user.login FILTER html %]"/>
   [%- END %]
       <separator class="thin"/>
   [%- IF user.showmybugslink %]
-- 
cgit v1.2.3-24-g4f1b