Skip to content

bugzilla
bugzilla
Commit 91c7a131 authored by justdave%syndicomm.com's avatar justdave%syndicomm.com
Browse files
Options

Bug 193989: EmailSuffix wasn't getting used for password change tokens. Also…

Bug 193989: EmailSuffix wasn't getting used for password change tokens. Also removes real name from To: header which wasn't being escaped properly for RFC2822 specs. Patch by Jeff Lawson <jlawson-mozilla@bovine.net> r=justdave, a=justdave
parent 4147ebb8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
Bugzilla/Token.pm
View file @ 91c7a131
......@@ -209,13 +209,10 @@ sub Cancel {
# Get the email address of the Bugzilla maintainer.
my $maintainer = Param('maintainer');
# Format the user's real name and email address into a single string.
my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
my $template = $::template;
my $vars = $::vars;
$vars->{'emailaddress'} = $username;
$vars->{'emailaddress'} = $loginname . Param('emailsuffix');
$vars->{'maintainer'} = $maintainer;
$vars->{'remoteaddress'} = $::ENV{'REMOTE_ADDR'};
$vars->{'token'} = $token;
......
Token.pm
View file @ 91c7a131
......@@ -209,13 +209,10 @@ sub Cancel {
# Get the email address of the Bugzilla maintainer.
my $maintainer = Param('maintainer');
# Format the user's real name and email address into a single string.
my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
my $template = $::template;
my $vars = $::vars;
$vars->{'emailaddress'} = $username;
$vars->{'emailaddress'} = $loginname . Param('emailsuffix');
$vars->{'maintainer'} = $maintainer;
$vars->{'remoteaddress'} = $::ENV{'REMOTE_ADDR'};
$vars->{'token'} = $token;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment