From fe58db6798e0060bdf2f8d9869cbd5df620ab451 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com"
 <lpsolit%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 30 Mar 2007 22:42:22 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20376049:=20Remove=20validateCanChangeAttac?=
 =?UTF-8?q?hment()=20from=20attachment.cgi=20-=20Patch=20by=20Fr=C3=83?=
 =?UTF-8?q?=C2=A9d=C3=83=C2=A9ric=20Buclin=20<LpSolit@gmail.com>=20r/a=3DL?=
 =?UTF-8?q?pSolit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.0.0.236/trunk@222662 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/attachment.cgi | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/mozilla/webtools/bugzilla/attachment.cgi b/mozilla/webtools/bugzilla/attachment.cgi
index 578adfac097..6598651c220 100755
--- a/mozilla/webtools/bugzilla/attachment.cgi
+++ b/mozilla/webtools/bugzilla/attachment.cgi
@@ -205,22 +205,6 @@ sub validateContext
   return $context;
 }
 
-sub validateCanChangeAttachment 
-{
-    my ($attachid) = @_;
-    my $dbh = Bugzilla->dbh;
-    my ($productid) = $dbh->selectrow_array(
-            "SELECT product_id
-             FROM attachments
-             INNER JOIN bugs
-             ON bugs.bug_id = attachments.bug_id
-             WHERE attach_id = ?", undef, $attachid);
-
-    Bugzilla->user->can_edit_product($productid)
-      || ThrowUserError("illegal_attachment_edit",
-                        { attach_id => $attachid });
-}
-
 sub validateCanChangeBug
 {
     my ($bugid) = @_;
@@ -600,7 +584,7 @@ sub update
     my $bug = new Bugzilla::Bug($bugid);
     my $attachment = Bugzilla::Attachment->get($attach_id);
     $attachment->validate_can_edit($bug->product_id);
-    validateCanChangeAttachment($attach_id);
+    validateCanChangeBug($bugid);
     Bugzilla::Attachment->validate_description(THROW_ERROR);
     Bugzilla::Attachment->validate_is_patch(THROW_ERROR);
     Bugzilla::Attachment->validate_content_type(THROW_ERROR) unless $cgi->param('ispatch');
@@ -775,7 +759,7 @@ sub delete_attachment {
     # Make sure the administrator is allowed to edit this attachment.
     my ($attach_id, $bug_id) = validateID();
     my $attachment = Bugzilla::Attachment->get($attach_id);
-    validateCanChangeAttachment($attach_id);
+    validateCanChangeBug($bug_id);
 
     $attachment->datasize || ThrowUserError('attachment_removed');