summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Template.pm
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-09-25 19:43:38 +0200
committerByron Jones <glob@mozilla.com>2014-09-25 19:43:38 +0200
commit66120625eb3e3f656c7b55e4bbd7e4303b5ae4cf (patch)
tree487ce25e8a7509c19fcd52377b4fb80bd13bf553 /Bugzilla/Template.pm
parentce91bc0428b2ec584de0672c8d5e681d3b52655c (diff)
downloadbugzilla-66120625eb3e3f656c7b55e4bbd7e4303b5ae4cf.tar.gz
bugzilla-66120625eb3e3f656c7b55e4bbd7e4303b5ae4cf.tar.xz
Bug 1072110: _concatenate_js assumes javascript_urls is an array
Diffstat (limited to 'Bugzilla/Template.pm')
-rw-r--r--Bugzilla/Template.pm3
1 files changed, 2 insertions, 1 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 {