From c9806c3558e6a37c748488520d0c83e471809104 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Wed, 19 Aug 2009 04:44:52 +0000
Subject: Bug 73330: Remove extra newlines in bugmail Patch by Max
 Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit

---
 Bugzilla/BugMail.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 9a1b2a8a2..ec4bf30da 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -352,7 +352,7 @@ sub Send {
 
         if ($deptext) {
             my $diffpart = {};
-            $diffpart->{'text'} = "\n" . trim("\n\n" . $deptext);
+            $diffpart->{'text'} = "\n" . trim($deptext);
             push(@diffparts, $diffpart);
         }
     }
@@ -595,6 +595,8 @@ sub sendMail {
     }
 
     my $diffs = $difftext;
+    # Remove extra newlines.
+    $diffs =~ s/^\n+//s; $diffs =~ s/\n+$//s;
     if ($isnew) {
         my $head = "";
         foreach my $f (@headerlist) {
-- 
cgit v1.2.3-24-g4f1b