Bug 371808: 'emailsuffix' is duplicated on email notification - Patch by Frédéric...

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index fa52464f839a78a54e42b199307f3c868f45a628..8b6f7678bb8f6aea865da57defe6463c23aa9ae7 100644 (file)
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -705,10 +705,9 @@ sub prepare_comments {
         if ($count) {
             $result .= "\n\n--- Comment #$count from ";
             if ($comment->{'name'} eq $comment->{'email'}) {
-                $result .= $comment->{'email'} . Bugzilla->params->{'emailsuffix'};
+                $result .= $comment->{'email'};
             } else {
-                $result .= $comment->{'name'} . " <" . $comment->{'email'} .
-                           Bugzilla->params->{'emailsuffix'} . ">";
+                $result .= $comment->{'name'} . " <" . $comment->{'email'} . ">";
             }
             $result .= "  " . format_time($comment->{'time'}) . " ---\n";
         }