diff options
| author | justdave%syndicomm.com <> | 2003-03-14 13:43:38 +0000 |
|---|---|---|
| committer | justdave%syndicomm.com <> | 2003-03-14 13:43:38 +0000 |
| commit | 91c7a131f28e8b3e066ba493f5c0a1f00e3e836b (patch) | |
| tree | 92a5b4c8e23d33b31090c33eb8ecf6d355006f0e /Bugzilla | |
| parent | 4147ebb81f915ab94b1242bb9c01614c6875f093 (diff) | |
| download | bugs-91c7a131f28e8b3e066ba493f5c0a1f00e3e836b.tar bugs-91c7a131f28e8b3e066ba493f5c0a1f00e3e836b.tar.gz bugs-91c7a131f28e8b3e066ba493f5c0a1f00e3e836b.tar.bz2 bugs-91c7a131f28e8b3e066ba493f5c0a1f00e3e836b.tar.xz bugs-91c7a131f28e8b3e066ba493f5c0a1f00e3e836b.zip | |
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
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Token.pm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm index ea1e51606..c8132b804 100644 --- a/Bugzilla/Token.pm +++ b/Bugzilla/Token.pm @@ -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; |