1 files changed, 14 insertions, 2 deletions

diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm
index 811530c42..910e2d425 100644
--- a/Bugzilla/FlagType.pm
+++ b/Bugzilla/FlagType.pm
@@ -52,6 +52,7 @@ use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Util;
 use Bugzilla::Group;
+use Bugzilla::Hook;
 
 use base qw(Bugzilla::Object);
 
@@ -133,6 +134,8 @@ sub create {
                               exclusions => $exclusions });
     $flagtype->update();
 
+    Bugzilla::Hook::process('flagtype_end_of_create', { type => $flagtype });
+
     $dbh->bz_commit_transaction();
     return $flagtype;
 }
@@ -201,6 +204,9 @@ sub update {
                   undef, $self->id);
     }
 
+    Bugzilla::Hook::process('flagtype_end_of_update',
+        { type => $self, changed => $changes });
+
     $dbh->bz_commit_transaction();
     return $changes;
 }
@@ -462,7 +468,8 @@ sub grant_list {
     my @custusers;
     my @allusers = @{Bugzilla->user->get_userlist};
     foreach my $user (@allusers) {
-        my $user_obj = new Bugzilla::User({name => $user->{login}});
+        my $user_obj
+            = new Bugzilla::User({ name => $user->{login}, cache => 1 });
         push(@custusers, $user) if $user_obj->can_set_flag($self);
     }
     return \@custusers;
@@ -601,7 +608,7 @@ sub match {
     $tables = join(' ', @$tables);
     $criteria = join(' AND ', @criteria);
 
-    my $flagtype_ids = $dbh->selectcol_arrayref("SELECT id FROM $tables WHERE $criteria");
+    my $flagtype_ids = $dbh->selectcol_arrayref("SELECT flagtypes.id FROM $tables WHERE $criteria");
 
     return Bugzilla::FlagType->new_from_list($flagtype_ids);
 }
@@ -679,6 +686,11 @@ sub sqlify_criteria {
         my $is_active = $criteria->{is_active} ? "1" : "0";
         push(@criteria, "flagtypes.is_active = $is_active");
     }
+    if (exists($criteria->{active_or_has_flags}) && $criteria->{active_or_has_flags} =~ /^\d+$/) {
+        push(@$tables, "LEFT JOIN flags AS f ON flagtypes.id = f.type_id " . 
+                       "AND f.bug_id = " . $criteria->{active_or_has_flags});
+        push(@criteria, "(flagtypes.is_active = 1 OR f.id IS NOT NULL)");    
+    }
     if ($criteria->{product_id}) {
         my $product_id = $criteria->{product_id};
         detaint_natural($product_id)