Patch for bug 234171; removes \%COOKIE from index.cgi; patch by Teemu Mannermaa <wicked@etlicon.fi>; r=gerv; a=justdave.

2 files changed, 4 insertions, 10 deletions

diff --git a/index.cgi b/index.cgi
index f617965d3..bbe936207 100755
--- a/index.cgi
+++ b/index.cgi
@@ -21,10 +21,6 @@
 # Contributor(s): Jacob Steenhagen <jake@bugzilla.org>
 #
 
-# Suppress silly "used only once" warnings
-use vars qw{ %COOKIE };
-
-
 ###############################################################################
 # Script Initialization
 ###############################################################################
@@ -37,7 +33,6 @@ use lib ".";
 require "CGI.pl";
 
 use vars qw(
-  $template
   $vars
 );
 
@@ -52,8 +47,7 @@ quietly_check_login('permit_anonymous');
 ###############################################################################
 
 my $cgi = Bugzilla->cgi;
-
-$vars->{'username'} = $::COOKIE{'Bugzilla_login'} || '';
+my $template = Bugzilla->template;
 
 # Return the appropriate HTTP response headers.
 print $cgi->header();
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index dd35059e5..b8ea79826 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -22,7 +22,7 @@
   #%]
 
 [%# INTERFACE:
-  # username: string. The login name of the user, if any.
+  # This template has no interface.
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
@@ -64,9 +64,9 @@ function addSidebar() {
   <a href="enter_bug.cgi">Enter a new [% terms.bug %] report</a><br>
   <a href="report.cgi">Summary reports and charts</a><br>
   </p><p>
-[% IF username %]
+[% IF user.id %]
   <a href="userprefs.cgi">Change password or user preferences</a><br>
-  <a href="relogin.cgi">Logout [% username FILTER html %]</a><br>
+  <a href="relogin.cgi">Logout [% user.login FILTER html %]</a><br>
 [% ELSE %]
   <a href="query.cgi?GoAheadAndLogIn=1">Log in to an existing account</a><br>
   [% IF Param('createemailregexp') %]