summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2016-10-13 16:28:08 +0200
committerDylan William Hardison <dylan@hardison.net>2016-10-18 18:46:04 +0200
commit14ee84314a54c530f7a71420334c978c43cebeb3 (patch)
treefd868eeb54c03b77f38b720776fce625f2c3418c /template
parent7d445a428fc4731006b3743be922a17d84e5155d (diff)
downloadbugzilla-14ee84314a54c530f7a71420334c978c43cebeb3.tar.gz
bugzilla-14ee84314a54c530f7a71420334c978c43cebeb3.tar.xz
Bug 1309884 - constants.CONCATENATE_ASSETS gets constant folded when true
Diffstat (limited to 'template')
-rw-r--r--template/en/default/global/header.html.tmpl12
1 files changed, 5 insertions, 7 deletions
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index fff74f454..bc4a424fa 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -113,8 +113,8 @@
[% END %]
[% SET css_sets = css_files(style_urls, yui, yui_css) %]
- [% IF constants.CONCATENATE_ASSETS %]
- [% PROCESS format_css_link asset_url = css_sets.unified_standard_skin %]
+ [% IF css_sets.concatenated_standard_skin %]
+ [% PROCESS format_css_link asset_url = css_sets.concatenated_standard_skin %]
[% ELSE %]
[% FOREACH asset_url = css_sets.standard %]
[% PROCESS format_css_link %]
@@ -130,14 +130,12 @@
</style>
[% END %]
- [% IF css_sets.unified_custom %]
- [% IF constants.CONCATENATE_ASSETS %]
- [% PROCESS format_css_link asset_url = css_sets.unified_custom %]
- [% ELSE %]
+ [% IF css_sets.concatenated_custom %]
+ [% PROCESS format_css_link asset_url = css_sets.concatenated_custom %]
+ [% ELSE %]
[% FOREACH asset_url = css_sets.custom %]
[% PROCESS format_css_link %]
[% END %]
- [% END %]
[% END %]
[% IF NOT no_yui %]