Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1072110: _concatenate_js assumes javascript_urls is an array

Browse Source 
r=dkl,a=glob


git-svn-id: svn://10.0.0.236/trunk@265587 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-09-25 18:00:50 +00:00
parent c34e6dd246
commit 50069d13e9
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9147 9148

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
e877bb3a0f67a24f4403e9e774838811d675b85e 03c85287139860563b219ea85eb0583e7d40158b

3
mozilla/webtools/bugzilla/Bugzilla/Template.pm
View File

@ -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 {

2
mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
View File

@ -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>

2
mozilla/webtools/bugzilla/template/en/default/list/change-columns.html.tmpl
View File

@ -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()"
%] %]