summaryrefslogtreecommitdiffstats
path: root/Bugzilla/BugMail.pm
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2014-12-05 23:46:59 +0100
committerDavid Lawrence <dkl@mozilla.com>2014-12-05 23:47:30 +0100
commit66da5aeeaf1b14f70864cc19940ca188e6341528 (patch)
tree2c82542e531c1a89be3a7e87ec3705b612466db9 /Bugzilla/BugMail.pm
parent57c99986924bfebb7ad044ec1753220d1ff243cc (diff)
downloadbugzilla-66da5aeeaf1b14f70864cc19940ca188e6341528.tar.gz
bugzilla-66da5aeeaf1b14f70864cc19940ca188e6341528.tar.xz
Bug 829358: Changing the name of a private attachment in an unhidden bug results in the name change being sent unencrypted
Diffstat (limited to 'Bugzilla/BugMail.pm')
-rw-r--r--Bugzilla/BugMail.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 6466448bc..7244d97a5 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -365,13 +365,14 @@ sub sendMail {
my $relRef = $params->{rels_which_want};
my $referenced_bugs = $params->{referenced_bugs};
my $dep_only = $params->{dep_only};
+ my $attach_id;
# Only display changes the user is allowed see.
my @display_diffs;
foreach my $diff (@diffs) {
my $add_diff = 0;
-
+
if (grep { $_ eq $diff->{field_name} } TIMETRACKING_FIELDS) {
$add_diff = 1 if $user->is_timetracker;
}
@@ -379,6 +380,7 @@ sub sendMail {
$add_diff = 1;
}
push(@display_diffs, $diff) if $add_diff;
+ $attach_id = $diff->{attach_id} if $diff->{attach_id};
}
if (!$user->is_insider) {
@@ -428,6 +430,7 @@ sub sendMail {
date => $date,
to_user => $user,
bug => $bug,
+ attach_id => $attach_id,
reasons => \@reasons,
reasons_watch => \@reasons_watch,
reasonsheader => join(" ", @headerrel),