From: lpsolit%gmail.com <>
Date: Mon, 29 Dec 2008 00:35:57 +0000 (+0000)
Subject: Bug 471324: Don't build mail headers for existing bugs (too many calls to multiline_s... 
X-Git-Tag: bugzilla-3.2.1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=889d07b91b45333d67aef91124c9b817c81c7066;p=thirdparty%2Fbugzilla.git

Bug 471324: Don't build mail headers for existing bugs (too many calls to multiline_sprintf()) - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=LpSolit
---

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 9aa373dc54..46f5597186 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -552,26 +552,7 @@ sub sendMail {
     my %mailhead = %$dmhRef;
     my %fielddescription = %$fdRef;
     my @diffparts = @$diffRef;    
-    my $head = "";
     
-    foreach my $f (@headerlist) {
-      if ($mailhead{$f}) {
-        my $value = $values{$f};
-        # If there isn't anything to show, don't include this header
-        if (! $value) {
-          next;
-        }
-        # Only send estimated_time if it is enabled and the user is in the group
-        if (($f ne 'estimated_time' && $f ne 'deadline') ||
-             $user->groups->{Bugzilla->params->{'timetrackinggroup'}}) {
-
-            my $desc = $fielddescription{$f};
-            $head .= multiline_sprintf(FORMAT_DOUBLE, ["$desc:", $value], 
-                                       FORMAT_2_SIZE);
-        }
-      }
-    }
-
     # Build difftext (the actions) by verifying the user should see them
     my $difftext = "";
     my $diffheader = "";
@@ -625,6 +606,21 @@ sub sendMail {
 
     my $diffs = $difftext . "\n\n" . $newcomments;
     if ($isnew) {
+        my $head = "";
+        foreach my $f (@headerlist) {
+            next unless $mailhead{$f};
+            my $value = $values{$f};
+            # If there isn't anything to show, don't include this header.
+            next unless $value;
+            # Only send estimated_time if it is enabled and the user is in the group.
+            if (($f ne 'estimated_time' && $f ne 'deadline')
+                || $user->groups->{Bugzilla->params->{'timetrackinggroup'}})
+            {
+                my $desc = $fielddescription{$f};
+                $head .= multiline_sprintf(FORMAT_DOUBLE, ["$desc:", $value],
+                                           FORMAT_2_SIZE);
+            }
+        }
         $diffs = $head . ($difftext ? "\n\n" : "") . $diffs;
     }