Bug 322285: Cancelling a flag should remove it completely from the DB - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=myk

1 files changed, 2 insertions, 4 deletions

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 445e13ec6..c0063aa14 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -429,8 +429,7 @@ sub flag_types {
         $flag_type->{'flags'} = Bugzilla::Flag::match(
             { 'bug_id'      => $self->bug_id,
               'type_id'     => $flag_type->{'id'},
-              'target_type' => 'bug',
-              'is_active'   => 1 });
+              'target_type' => 'bug' });
     }
 
     $self->{'flag_types'} = $flag_types;
@@ -515,8 +514,7 @@ sub show_attachment_flags {
           'component_id' => $self->{'component_id'} });
     my $num_attachment_flags = Bugzilla::Flag::count(
         { 'target_type'  => 'attachment',
-          'bug_id'       => $self->bug_id,
-          'is_active'    => 1 });
+          'bug_id'       => $self->bug_id });
 
     $self->{'show_attachment_flags'} =
         ($num_attachment_flag_types || $num_attachment_flags);