Bug 833336: Needinfo tries to match the needinfo user even when you decided you didn't need info

1 files changed, 11 insertions, 9 deletions

diff --git a/extensions/Needinfo/Extension.pm b/extensions/Needinfo/Extension.pm
index 413934c23..b47b13f89 100644
--- a/extensions/Needinfo/Extension.pm
+++ b/extensions/Needinfo/Extension.pm
@@ -57,21 +57,23 @@ sub bug_start_of_update {
     my $cgi    = Bugzilla->cgi;
     my $params = Bugzilla->input_params;
 
-    # do a match if applicable
-    Bugzilla::User::match_field({
-        'needinfo_from' => { 'type' => 'single' }
-    });
+    my $needinfo      = delete $params->{needinfo};
+    my $needinfo_from = delete $params->{needinfo_from};
+    my $needinfo_role = delete $params->{needinfo_role};
+    my $is_private    = $params->{'comment_is_private'};
+
+    if ($user->in_group('canconfirm') && $needinfo) {
+        # do a match if applicable
+        Bugzilla::User::match_field({
+            'needinfo_from' => { 'type' => 'single' }
+        });
+    }
 
     # Set needinfo_done param to true so as to not loop back here
     return if $params->{needinfo_done};
     $params->{needinfo_done} = 1;
     Bugzilla->input_params($params);
 
-    my $needinfo      = delete $params->{needinfo};
-    my $needinfo_from = delete $params->{needinfo_from};
-    my $needinfo_role = delete $params->{needinfo_role};
-    my $is_private    = $params->{'comment_is_private'};
-
     my @needinfo_overrides;
     foreach my $key (grep(/^needinfo_override_/, keys %$params)) {
         my ($id) = $key =~ /(\d+)$/;