Bug 1446236 - Add & use simpler method to check if an extension is present (#35)

Author: CyberShadow

Bugzilla.pm

@@ -125,6 +125,14 @@ sub template_inner {
 }
 
 sub extensions {
+  # Guard against extensions querying the extension list during initialization
+  # (through this method or has_extension).
+  # The extension list is not fully populated at that point,
+  # so the results would not be meaningful.
+  state $recursive = 0;
+  die "Recursive attempt to load/query extensions" if $recursive;
+  $recursive = 1;
+
   state $extensions;
   return $extensions if $extensions;
   my $extension_packages = Bugzilla::Extension->load_all();
@@ -134,9 +142,20 @@ sub extensions {
       push @$extensions, $package;
     }
   }
+  $recursive = 0;
   return $extensions;
 }
 
+sub has_extension {
+  my ($class, $name) = @_;
+  my $cache = $class->request_cache;
+  if (!$cache->{extensions_hash}) {
+    my %extensions = map { $_->NAME => 1 } @{Bugzilla->extensions};
+    $cache->{extensions_hash} = \%extensions;
+  }
+  return exists $cache->{extensions_hash}{$name};
+}
+
 sub cgi {
   return request_cache->{cgi} ||= Bugzilla::CGI->new;
 }

Bugzilla/Search.pm

@@ -34,7 +34,6 @@ use Date::Format;
 use Date::Parse;
 use Scalar::Util qw(blessed);
 use List::MoreUtils qw(all firstidx part uniq);
-use List::Util qw(any);
 use POSIX qw(INT_MAX);
 use Storable qw(dclone);
 use Time::HiRes qw(gettimeofday tv_interval);
@@ -803,9 +802,7 @@ sub data {
   # BMO - to avoid massive amounts of joins, if we're selecting a lot of
   # tracking flags, replace them with placeholders. the values will be
   # retrieved later and injected into the result.
-  state $have_tracking_flags
-    = any { $_->NAME eq 'TrackingFlags' } @{Bugzilla->extensions};
-  if ($have_tracking_flags) {
+  if (Bugzilla->has_extension('TrackingFlags')) {
     my %tf_map = map { $_ => 1 } Bugzilla->tracking_flag_names;
     my @tf_selected = grep { exists $tf_map{$_} } @orig_fields;
 
@@ -874,7 +871,7 @@ sub data {
   $self->{data} = [map { $data{$_} } @$bug_ids];
 
   # BMO - get tracking flags values, and insert into result
-  if ($have_tracking_flags && @{$self->{tracking_flags}}) {
+  if (Bugzilla->has_extension('TrackingFlags') && @{$self->{tracking_flags}}) {
 
     # read values
     my $values;

extensions/BugModal/Extension.pm

@@ -197,9 +197,7 @@ sub template_before_process {
   return if exists $bug->{error};
 
   # trigger loading of tracking flags
-  state $have_tracking_flags
-    = any { $_->NAME eq 'TrackingFlags' } @{Bugzilla->extensions};
-  if ($have_tracking_flags) {
+  if (Bugzilla->has_extension('TrackingFlags')) {
     Bugzilla::Extension::TrackingFlags->template_before_process({
       file => 'bug/edit.html.tmpl', vars => $vars,
     });

votes.cgi

@@ -30,8 +30,7 @@ use lib qw(. lib local/lib/perl5);
 use Bugzilla;
 use Bugzilla::Error;
 
-my $is_enabled = grep { $_->NAME eq 'Voting' } @{Bugzilla->extensions};
-$is_enabled || ThrowCodeError('extension_disabled', {name => 'Voting'});
+Bugzilla->has_extension('Voting') || ThrowCodeError('extension_disabled', { name => 'Voting' });
 
 my $cgi = Bugzilla->cgi;
 my $action = $cgi->param('action') || 'show_user';