$name";
$vars->{'url'} = "query.cgi";
@@ -1453,7 +1467,7 @@ $vars->{'urlquerypart'} =~ s/[&?](order|cmdtype)=[^&]*//g;
$vars->{'order'} = $order;
# The user's login account name (i.e. email address).
-$vars->{'user'} = $::COOKIE{'Bugzilla_login'};
+my $login = $::COOKIE{'Bugzilla_login'};
$vars->{'caneditbugs'} = UserInGroup('editbugs');
$vars->{'usebuggroups'} = UserInGroup('usebuggroups');
@@ -1461,8 +1475,8 @@ $vars->{'usebuggroups'} = UserInGroup('usebuggroups');
# Whether or not this user is authorized to move bugs to another installation.
$vars->{'ismover'} = 1
if Param('move-enabled')
- && defined($vars->{'user'})
- && Param('movers') =~ /^(\Q$vars->{'user'}\E[,\s])|([,\s]\Q$vars->{'user'}\E[,\s]+)/;
+ && defined($login)
+ && Param('movers') =~ /^(\Q$login\E[,\s])|([,\s]\Q$login\E[,\s]+)/;
my @bugowners = keys %$bugowners;
if (scalar(@bugowners) > 1 && UserInGroup('editbugs')) {
diff --git a/checksetup.pl b/checksetup.pl
index 4f59e92e6..e1a551506 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -842,6 +842,7 @@ END
js => sub { return $_; },
html => sub { return $_; },
url_quote => sub { return $_; }
+ no_break => sub { return $_; }
},
}) || die ("Could not create Template: " . Template->error() . "\n");
diff --git a/globals.pl b/globals.pl
index f6e651e3c..d04133d10 100644
--- a/globals.pl
+++ b/globals.pl
@@ -486,7 +486,6 @@ sub GenerateVersionTable {
}
}
-
my $cols = LearnAboutColumns("bugs");
@::log_columns = @{$cols->{"-list-"}};
@@ -1574,6 +1573,15 @@ $::template ||= Template->new(
# filter should be used for a full URL that may have
# characters that need encoding.
url_quote => \&url_quote ,
+
+ # Returns the text with spaces converted to non-breaking space
+ # HTML entities.
+ no_break => sub
+ {
+ my ($var) = @_;
+ $var =~ s/ /\ /g;
+ return $var;
+ } ,
} ,
}
) || DisplayError("Template creation failed: " . Template->error())
@@ -1756,6 +1764,8 @@ $::vars =
# User Agent - useful for detecting in templates
'user_agent' => $ENV{'HTTP_USER_AGENT'} ,
+
+ 'use_votes' => $::anyvotesallowed,
};
1;
diff --git a/relogin.cgi b/relogin.cgi
index d07de9ef6..0d64fb71f 100755
--- a/relogin.cgi
+++ b/relogin.cgi
@@ -66,6 +66,7 @@ delete $::COOKIE{"Bugzilla_login"};
next time it is required.";
$vars->{'url'} = "query.cgi?GoAheadAndLogIn=1";
$vars->{'link'} = "Log in again here";
+ $vars->{'user'} = {};
print "Content-Type: text/html\n\n";
$template->process("global/message.html.tmpl", $vars)
diff --git a/t/004template.t b/t/004template.t
index 4332e2e82..f9cd0fad9 100644
--- a/t/004template.t
+++ b/t/004template.t
@@ -70,6 +70,7 @@ my $template = Template->new(
js => sub { return $_ } ,
strike => sub { return $_ } ,
url_quote => sub { return $_ } ,
+ no_break => sub { return $_ } ,
},
}
);
diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl
index 261e0f864..4797d71b7 100644
--- a/template/en/default/bug/votes/list-for-user.html.tmpl
+++ b/template/en/default/bug/votes/list-for-user.html.tmpl
@@ -21,9 +21,11 @@
[% PROCESS global/header.html.tmpl
title = "Show Votes"
- h2 = user.name
+ h2 = voting_user.name
%]
+[% canedit = 1 IF voting_user.login == user.login %]
+
[% IF votes_recorded %]
@@ -76,7 +78,7 @@
- [% IF user.canedit %]
+ [% IF canedit %]
You are
[% ELSE %]
This user is
diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl
index 8b3af59a4..b611cb06c 100644
--- a/template/en/default/global/footer.html.tmpl
+++ b/template/en/default/global/footer.html.tmpl
@@ -16,12 +16,46 @@
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
- # Contributor(s):
+ # Contributor(s): Gervase Markham
+
+
+
+
+
+
+
+
+
+
+[%# Migration note: this section corresponds to the old Param 'blurbhtml' %]
+
+ This is Bugzilla: the Mozilla bug system. For more
+ information about what Bugzilla is and what it can do, see
+ bugzilla.org.
+
+[%# End section %]
+
+
+
+
+[% Migration note: useful-links.html.tmpl corresponds to %commandmenu% %]
+
+ [% PROCESS "global/useful-links.html.tmpl" %]
+
+