Bug 1072110: _concatenate_js assumes javascript_urls is an array

globau · globau · commit 66120625eb3e · 2014-09-26T01:43:38.000+08:00
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
@@ -528,7 +528,8 @@ sub _css_url_rewrite {
 sub _concatenate_js {
     return @_ unless CONCATENATE_ASSETS;
     my ($sources) = @_;
-    return [] unless $sources && ref($sources);
+    return [] unless $sources;
+    $sources = ref($sources) ? $sources : [ $sources ];
 
     my %files =
         map {
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
@@ -52,7 +52,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
     [% bugsummary FILTER html %]
   [% END %]
   [% PROCESS global/header.html.tmpl doc_section = "attachments.html#patchviewer"
-                                     javascript_urls = "js/attachment.js"
+                                     javascript_urls = [ "js/attachment.js" ]
                                      style_urls = ['skins/standard/attachment.css'] %]
 [% ELSE %]
   <html>
diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
@@ -23,7 +23,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Change Columns"
-  javascript_urls = "js/change-columns.js"
+  javascript_urls = [ "js/change-columns.js" ]
   onload = "initChangeColumns()"
 %]
 
