From: jocuri%softhome.net <>
Date: Sat, 20 Mar 2004 06:03:52 +0000 (+0000)
Subject: Patch for bug 179351: improve variable scoping issues in order to fix a bug causing... 
X-Git-Tag: bugzilla-2.18rc1~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9bcdba2ac385a91da5670bb33ca69711bdaaeda;p=thirdparty%2Fbugzilla.git

Patch for bug 179351: improve variable scoping issues in order to fix a bug causing oddly formatted dependency emails; patch by Teemu Mannermaa <wicked@etlicon.fi> revised slightly by justdave; r=joel; a=justdave.
---

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index fad3ad5d85..dc088c99cf 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -221,12 +221,11 @@ sub ProcessOneBug($) {
 
     my $difftext = "";
     my $diffheader = "";
-    my $diffpart = {};
     my @diffparts;
     my $lastwho = "";
     foreach my $ref (@diffs) {
         my ($who, $what, $when, $old, $new, $attachid, $fieldname) = (@$ref);
-        $diffpart = {};
+        my $diffpart = {};
         if ($who ne $lastwho) {
             $lastwho = $who;
             $diffheader = "\n$who" . Param('emailsuffix') . " changed:\n\n";
@@ -301,8 +300,8 @@ sub ProcessOneBug($) {
     $deptext = trim($deptext);
 
     if ($deptext) {
-        #$difftext = trim($difftext . "\n\n" . $deptext);
-        $diffpart->{'text'} = trim("\n\n" . $deptext);
+        my $diffpart = {};
+        $diffpart->{'text'} = "\n" . trim("\n\n" . $deptext);
         push(@diffparts, $diffpart);
     }