From: Dylan William Hardison Date: Wed, 7 Sep 2016 23:35:31 +0000 (-0400) Subject: Bug 1294587 - The CSP feature is broken X-Git-Tag: release-5.1.2~77 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9c400173077e841ef5d48039c7fe09af0ae48c4;p=thirdparty%2Fbugzilla.git Bug 1294587 - The CSP feature is broken r=dkl --- diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm index 88dfeb4d26..d43a68f93c 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};