Skip to content

bugzilla
bugzilla
Commit 03c85287 authored by Byron Jones's avatar Byron Jones
Browse files
Options

Bug 1072110: _concatenate_js assumes javascript_urls is an array

r=dkl,a=glob
parent e877bb3a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
Bugzilla/Template.pm
View file @ 03c85287
...@@ -546,7 +546,8 @@ sub _css_url_rewrite { ...@@ -546,7 +546,8 @@ sub _css_url_rewrite {
sub _concatenate_js { sub _concatenate_js {
return @_ unless CONCATENATE_ASSETS; return @_ unless CONCATENATE_ASSETS;
my ($sources) = @_; my ($sources) = @_;
return [] unless $sources && ref($sources); return [] unless $sources;
$sources = ref($sources) ? $sources : [ $sources ];
my %files = my %files =
map { map {
......
template/en/default/attachment/diff-header.html.tmpl
View file @ 03c85287
...@@ -38,7 +38,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] ...@@ -38,7 +38,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
[% bugsummary FILTER html %] [% bugsummary FILTER html %]
[% END %] [% END %]
[% PROCESS global/header.html.tmpl doc_section = "using.html#patch-viewer" [% PROCESS global/header.html.tmpl doc_section = "using.html#patch-viewer"
javascript_urls = "js/attachment.js" javascript_urls = [ "js/attachment.js" ]
style_urls = ['skins/standard/bug.css'] %] style_urls = ['skins/standard/bug.css'] %]
[% ELSE %] [% ELSE %]
<!DOCTYPE html> <!DOCTYPE html>
......
template/en/default/list/change-columns.html.tmpl
View file @ 03c85287
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
[% PROCESS global/header.html.tmpl [% PROCESS global/header.html.tmpl
title = "Change Columns" title = "Change Columns"
javascript_urls = "js/change-columns.js" javascript_urls = [ "js/change-columns.js" ]
onload = "initChangeColumns()" onload = "initChangeColumns()"
%] %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment