diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2016-09-08 01:35:31 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2016-09-08 01:35:31 +0200 |
| commit | b9c400173077e841ef5d48039c7fe09af0ae48c4 (patch) | |
| tree | c4f306800177d60ea7478a25000a65b1d5c02533 /Bugzilla | |
| parent | 19470799dc9f7a5e261f37d31b6c3f274d507154 (diff) | |
| download | bugzilla-b9c400173077e841ef5d48039c7fe09af0ae48c4.tar.gz bugzilla-b9c400173077e841ef5d48039c7fe09af0ae48c4.tar.xz | |
Bug 1294587 - The CSP feature is broken
r=dkl
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/CGI.pm | 5 |
1 files 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}; |