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

Patch by Jeff Lawson <jlawson-mozilla@bovine.net>
r=justdave, a=justdave

diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index ea1e516066e9502d318b919496bdb2311ec47971..c8132b8048b5792346707bdd71ca9c065b0309b6 100644 (file)
--- 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;

diff --git a/Token.pm b/Token.pm
index ea1e516066e9502d318b919496bdb2311ec47971..c8132b8048b5792346707bdd71ca9c065b0309b6 100644 (file)
--- a/Token.pm
+++ b/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;