diff options
| author | Byron Jones <glob@mozilla.com> | 2014-09-25 19:43:38 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2014-09-25 19:43:38 +0200 |
| commit | 66120625eb3e3f656c7b55e4bbd7e4303b5ae4cf (patch) | |
| tree | 487ce25e8a7509c19fcd52377b4fb80bd13bf553 | |
| parent | ce91bc0428b2ec584de0672c8d5e681d3b52655c (diff) | |
| download | bugzilla-66120625eb3e3f656c7b55e4bbd7e4303b5ae4cf.tar.gz bugzilla-66120625eb3e3f656c7b55e4bbd7e4303b5ae4cf.tar.xz | |
Bug 1072110: _concatenate_js assumes javascript_urls is an array
| -rw-r--r-- | Bugzilla/Template.pm | 3 | ||||
| -rw-r--r-- | template/en/default/attachment/diff-header.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/list/change-columns.html.tmpl | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 6d6aee750..6a46701ff 100644 --- 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 index 8cb5525f7..b407b4f3a 100644 --- 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 index ff7e5d371..c5e02d684 100644 --- 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()" %] |