Bug 1508695 - Incorrect or missing tracking flags on search results in REST API

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 1abe94e56068bbb245f085d2bdb28c165dec2b20..44b68eaa43931b1a4b424d219b9707ce48334c10 100644 (file)
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -522,7 +522,6 @@ sub search {
   my $user = Bugzilla->user;
   my $dbh  = Bugzilla->dbh;
 
-  local $Bugzilla::Extension::TrackingFlags::Flag::SKIP_PRELOAD = 1;
   Bugzilla->switch_to_shadow_db();
 
   my $match_params = dclone($params);

diff --git a/extensions/TrackingFlags/lib/Flag.pm b/extensions/TrackingFlags/lib/Flag.pm
index b9ea41ebe6e8688284cff7becc17e164f06d67ae..5a09d944febdc717aab098492f1106fa237d5c2b 100644 (file)
--- a/extensions/TrackingFlags/lib/Flag.pm
+++ b/extensions/TrackingFlags/lib/Flag.pm
@@ -23,8 +23,6 @@ use Bugzilla::Extension::TrackingFlags::Flag::Bug;
 use Bugzilla::Extension::TrackingFlags::Flag::Value;
 use Bugzilla::Extension::TrackingFlags::Flag::Visibility;
 
-our $SKIP_PRELOAD = 0;
-
 ###############################
 ####    Initialization     ####
 ###############################
@@ -212,7 +210,7 @@ sub match {
   my $is_active_filter = delete $params->{is_active};
 
   my $flags = $class->SUPER::match($params);
-  preload_all_the_things($flags, {bug_id => $bug_id}) unless $SKIP_PRELOAD;
+  preload_all_the_things($flags, {bug_id => $bug_id});
 
   if ($is_active_filter) {
     $flags = [grep { $_->is_active || exists $_->{bug_flag} } @$flags];
@@ -225,7 +223,7 @@ sub get_all {
   my $cache = Bugzilla->request_cache;
   if (!exists $cache->{'tracking_flags'}) {
     my @tracking_flags = $self->SUPER::get_all(@_);
-    preload_all_the_things(\@tracking_flags) unless $SKIP_PRELOAD;
+    preload_all_the_things(\@tracking_flags);
     my %tracking_flags_hash = map { $_->flag_id => $_ } @tracking_flags;
     $cache->{'tracking_flags'} = \%tracking_flags_hash;
   }