From 6485d4afc4448b91953ba1fdb466393e54f80205 Mon Sep 17 00:00:00 2001 From: "justdave%syndicomm.com" Date: Fri, 14 Mar 2003 05:43:38 +0000 Subject: [PATCH] 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 r=justdave, a=justdave git-svn-id: svn://10.0.0.236/trunk@139436 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/Bugzilla/Token.pm | 5 +---- mozilla/webtools/bugzilla/Token.pm | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mozilla/webtools/bugzilla/Bugzilla/Token.pm b/mozilla/webtools/bugzilla/Bugzilla/Token.pm index ea1e516066e..c8132b8048b 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Token.pm +++ b/mozilla/webtools/bugzilla/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; diff --git a/mozilla/webtools/bugzilla/Token.pm b/mozilla/webtools/bugzilla/Token.pm index ea1e516066e..c8132b8048b 100644 --- a/mozilla/webtools/bugzilla/Token.pm +++ b/mozilla/webtools/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;