Merge branch 'master' into unstable

1 files changed, 14 insertions, 0 deletions

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index ba82c83d0..b932116a2 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -11,6 +11,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
+use Bugzilla::Logging;
 use CGI;
 use base qw(CGI);
 
@@ -597,7 +598,20 @@ sub header {
 sub param {
     my $self = shift;
 
+    # We don't let CGI.pm warn about list context, but we do it ourselves.
     local $CGI::LIST_CONTEXT_WARN = 0;
+    if (0) {
+        state $has_warned = {};
+
+        ## no critic (Freenode::Wantarray)
+        if ( wantarray && @_ ) {
+            my ( $package, $filename, $line ) = caller;
+            if ( $package ne 'CGI' && ! $has_warned->{"$filename:$line"}++) {
+                WARN("Bugzilla::CGI::param called in list context from $package $filename:$line");
+            }
+        }
+        ## use critic
+    }
 
     # When we are just requesting the value of a parameter...
     if (scalar(@_) == 1) {