summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Template.pm
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-09-25 19:39:39 +0200
committerByron Jones <glob@mozilla.com>2014-09-25 19:39:39 +0200
commit03c85287139860563b219ea85eb0583e7d40158b (patch)
tree23fe01767e09fbe5935dc926f32711b9035e6fa6 /Bugzilla/Template.pm
parente877bb3a0f67a24f4403e9e774838811d675b85e (diff)
downloadbugzilla-03c85287139860563b219ea85eb0583e7d40158b.tar.gz
bugzilla-03c85287139860563b219ea85eb0583e7d40158b.tar.xz
Bug 1072110: _concatenate_js assumes javascript_urls is an array
r=dkl,a=glob
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 c8f56d73d..e4c1bf460 100644
--- 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 {