diff options
| -rw-r--r-- | Bugzilla/Token.pm | 5 | ||||
| -rw-r--r-- | Token.pm | 5 |
2 files changed, 2 insertions, 8 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; @@ -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; |