diff options
author | Dave Lawrence <dlawrence@mozilla.com> | 2012-11-14 17:25:01 +0100 |
---|---|---|
committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-11-14 17:25:01 +0100 |
commit | e4e3c1b860c47976dc7314ec26d336caa59bebd0 (patch) | |
tree | 5161f7edb5d9b9046d7b98af3d000f37880f389b /Bugzilla/Attachment.pm | |
parent | 38fa3fab5ae996c6116b55fe87e60ea6b53b2923 (diff) | |
parent | 442d6df4683b7219738bb799a3650dd8b9c8431f (diff) | |
download | bugzilla-e4e3c1b860c47976dc7314ec26d336caa59bebd0.tar.gz bugzilla-e4e3c1b860c47976dc7314ec26d336caa59bebd0.tar.xz |
merged with bugzilla/4.2
Diffstat (limited to 'Bugzilla/Attachment.pm')
-rw-r--r-- | Bugzilla/Attachment.pm | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm index b80228e78..aa7eee2a7 100644 --- a/Bugzilla/Attachment.pm +++ b/Bugzilla/Attachment.pm @@ -771,11 +771,8 @@ sub validate_obsolete { $attachment->validate_can_edit($bug->product_id) || ThrowUserError('illegal_attachment_edit', { attach_id => $attachment->id }); - $vars->{'description'} = $attachment->description; - if ($attachment->bug_id != $bug->bug_id) { $vars->{'my_bug_id'} = $bug->bug_id; - $vars->{'attach_bug_id'} = $attachment->bug_id; ThrowCodeError('mismatched_bug_ids_on_obsolete', $vars); } |