Commit d9bcdba2 authored by jocuri%softhome.net's avatar jocuri%softhome.net

Patch for bug 179351: improve variable scoping issues in order to fix a bug…

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.
parent dffff7a2
...@@ -221,12 +221,11 @@ sub ProcessOneBug($) { ...@@ -221,12 +221,11 @@ sub ProcessOneBug($) {
my $difftext = ""; my $difftext = "";
my $diffheader = ""; my $diffheader = "";
my $diffpart = {};
my @diffparts; my @diffparts;
my $lastwho = ""; my $lastwho = "";
foreach my $ref (@diffs) { foreach my $ref (@diffs) {
my ($who, $what, $when, $old, $new, $attachid, $fieldname) = (@$ref); my ($who, $what, $when, $old, $new, $attachid, $fieldname) = (@$ref);
$diffpart = {}; my $diffpart = {};
if ($who ne $lastwho) { if ($who ne $lastwho) {
$lastwho = $who; $lastwho = $who;
$diffheader = "\n$who" . Param('emailsuffix') . " changed:\n\n"; $diffheader = "\n$who" . Param('emailsuffix') . " changed:\n\n";
...@@ -301,8 +300,8 @@ sub ProcessOneBug($) { ...@@ -301,8 +300,8 @@ sub ProcessOneBug($) {
$deptext = trim($deptext); $deptext = trim($deptext);
if ($deptext) { if ($deptext) {
#$difftext = trim($difftext . "\n\n" . $deptext); my $diffpart = {};
$diffpart->{'text'} = trim("\n\n" . $deptext); $diffpart->{'text'} = "\n" . trim("\n\n" . $deptext);
push(@diffparts, $diffpart); push(@diffparts, $diffpart);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment