From 344149d0e639267412ca0e2ccd95c2872e9350d9 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Fri, 14 Apr 2006 23:50:39 +0000 Subject: Bug 322285: Cancelling a flag should remove it completely from the DB - Patch by Frédéric Buclin r/a=myk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- attachment.cgi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'attachment.cgi') diff --git a/attachment.cgi b/attachment.cgi index a824ab71e..c212c6f36 100755 --- a/attachment.cgi +++ b/attachment.cgi @@ -836,8 +836,7 @@ sub viewall { $a->{'isviewable'} = isViewable($a->{'contenttype'}); - $a->{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a->{'attachid'}, - 'is_active' => 1 }); + $a->{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a->{'attachid'} }); } # Retrieve the bug summary (for displaying on screen) and assignee. @@ -1151,8 +1150,7 @@ sub edit { 'component_id' => $component_id }); foreach my $flag_type (@$flag_types) { $flag_type->{'flags'} = Bugzilla::Flag::match({ 'type_id' => $flag_type->{'id'}, - 'attach_id' => $attachment->id, - 'is_active' => 1 }); + 'attach_id' => $attachment->id }); } $vars->{'flag_types'} = $flag_types; $vars->{'any_flags_requesteeble'} = grep($_->{'is_requesteeble'}, @$flag_types); -- cgit v1.2.3-24-g4f1b