1 files changed, 7 insertions, 6 deletions

diff --git a/Bugzilla/Product.pm b/Bugzilla/Product.pm
index a0079a033..452ae90fc 100644
--- a/Bugzilla/Product.pm
+++ b/Bugzilla/Product.pm
@@ -114,7 +114,7 @@ sub create {
 # for each product in the list, particularly with hundreds or thousands
 # of products.
 sub preload {
-    my ($products, $preload_flagtypes) = @_;
+    my ($products, $preload_flagtypes, $flagtypes_params) = @_;
     my %prods = map { $_->id => $_ } @$products;
     my @prod_ids = keys %prods;
     return unless @prod_ids;
@@ -132,7 +132,7 @@ sub preload {
         }
     }
     if ($preload_flagtypes) {
-        $_->flag_types foreach @$products;
+        $_->flag_types($flagtypes_params) foreach @$products;
     }
 }
 
@@ -779,7 +779,8 @@ sub user_has_access {
 }
 
 sub flag_types {
-    my $self = shift;
+    my ($self, $params) = @_;
+    $params ||= {};
 
     return $self->{'flag_types'} if defined $self->{'flag_types'};
 
@@ -787,7 +788,7 @@ sub flag_types {
     my $cache = Bugzilla->request_cache->{flag_types_per_product} ||= {};
     $self->{flag_types} = {};
     my $prod_id = $self->id;
-    my $flagtypes = Bugzilla::FlagType::match({ product_id => $prod_id });
+    my $flagtypes = Bugzilla::FlagType::match({ product_id => $prod_id, %$params });
 
     foreach my $type ('bug', 'attachment') {
         my @flags = grep { $_->target_type eq $type } @$flagtypes;
@@ -816,8 +817,8 @@ sub flag_types {
 
 sub classification {
     my $self = shift;
-    $self->{'classification'} ||= 
-        new Bugzilla::Classification($self->classification_id);
+    $self->{'classification'} ||=
+        new Bugzilla::Classification({ id => $self->classification_id, cache => 1 });
     return $self->{'classification'};
 }