]> git.ipfire.org Git - thirdparty/bugzilla.git/commitdiff
projects / thirdparty / bugzilla.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e877bb3)
Bug 1072110: _concatenate_js assumes javascript_urls is an array
authorByron Jones <glob@mozilla.com>
Thu, 25 Sep 2014 17:39:39 +0000 (01:39 +0800)
committerByron Jones <glob@mozilla.com>
Thu, 25 Sep 2014 17:39:39 +0000 (01:39 +0800)
r=dkl,a=glob

Bugzilla/Template.pm patch | blob | blame | history
template/en/default/attachment/diff-header.html.tmpl patch | blob | blame | history
template/en/default/list/change-columns.html.tmpl patch | blob | blame | history

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index c8f56d73da28bf21815f895a9230f13c8920add2..e4c1bf4608caec4022ccf28f04e0a73eec13a83a 100644 (file)
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -546,7 +546,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
index 94d2b9541be641db5565449600532a9ea127828d..3d491fa4e287656269caf1c92b11c89445f7b461 100644 (file)
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -38,7 +38,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
     [% bugsummary FILTER html %]
   [% END %]
   [% 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'] %]
 [% ELSE %]
   <!DOCTYPE html>
diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
index 17d711eec8a89356b53e02253c29810324a45f1d..c0279803cce3d509965635c1e291f512c14d8f7f 100644 (file)
--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -8,7 +8,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Change Columns"
-  javascript_urls = "js/change-columns.js"
+  javascript_urls = [ "js/change-columns.js" ]
   onload = "initChangeColumns()"
 %]
 
Mirror of https://github.com/bugzilla/bugzilla.git