Bug 1426424 - feed daemon complains when trying to set an inactive review flag

diff --git a/extensions/PhabBugz/lib/Feed.pm b/extensions/PhabBugz/lib/Feed.pm
index b2b681bbdd3343afd949fe6a1eaf6d86b5ccf093..66b05e4ec7dffcc3cbf15b021d6e7674b10cab05 100644 (file)
--- a/extensions/PhabBugz/lib/Feed.pm
+++ b/extensions/PhabBugz/lib/Feed.pm
@@ -226,7 +226,7 @@ sub process_revision_change {
         my (@denied_flags, @new_flags, @removed_flags, %accepted_done, $flag_type);
         foreach my $flag (@{ $attachment->flags }) {
             next if $flag->type->name ne 'review';
-            $flag_type = $flag->type;
+            $flag_type = $flag->type if $flag->type->is_active;
             if (any { $flag->setter->id == $_ } @denied_user_ids) {
                 push(@denied_flags, { id => $flag->id, setter => $flag->setter, status => 'X' });
             }
@@ -239,7 +239,7 @@ sub process_revision_change {
             }
         }
 
-        $flag_type ||= first { $_->name eq 'review' } @{ $attachment->flag_types };
+        $flag_type ||= first { $_->name eq 'review' && $_->is_active } @{ $attachment->flag_types };
 
         # Create new flags
         foreach my $user_id (@accepted_user_ids) {