From b9c400173077e841ef5d48039c7fe09af0ae48c4 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Wed, 7 Sep 2016 19:35:31 -0400
Subject: Bug 1294587 - The CSP feature is broken r=dkl

---
 Bugzilla/CGI.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 88dfeb4d2..d43a68f93 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -109,13 +109,12 @@ sub new {
 }
 
 sub content_security_policy {
-    my ($self) = @_;
+    my ($self, %add_params) = @_;
     if (Bugzilla->has_feature('csp')) {
         require Bugzilla::CGI::ContentSecurityPolicy;
         return $self->{Bugzilla_csp} if $self->{Bugzilla_csp};
         my %params = DEFAULT_CSP;
-        if (@_) {
-            my %add_params = @_;
+        if (%add_params) {
             foreach my $key (keys %add_params) {
                 if (defined $add_params{$key}) {
                     $params{$key} = $add_params{$key};
-- 
cgit v1.2.3-24-g4f1b