From 14ee84314a54c530f7a71420334c978c43cebeb3 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Thu, 13 Oct 2016 10:28:08 -0400 Subject: Bug 1309884 - constants.CONCATENATE_ASSETS gets constant folded when true --- template/en/default/global/header.html.tmpl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'template') 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 @@ [% 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 %] -- cgit v1.2.3-24-g4f1b