From 14ee84314a54c530f7a71420334c978c43cebeb3 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Thu, 13 Oct 2016 10:28:08 -0400
Subject: Bug 1309884 - constants.CONCATENATE_ASSETS gets constant folded when
 true

---
 Bugzilla/Template.pm                        | 12 +++++++-----
 template/en/default/global/header.html.tmpl | 12 +++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index ce0276751..10f8b4eed 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -450,10 +450,12 @@ sub css_files {
         }
     }
 
-    # build unified
-    $by_type{unified_standard_skin} = _concatenate_css($by_type{standard},
-                                                       $by_type{skin});
-    $by_type{unified_custom} = _concatenate_css($by_type{custom});
+    # build concatenated
+    if (CONCATENATE_ASSETS) {
+        $by_type{concatenated_standard_skin} = _concatenate_css($by_type{standard},
+                                                        $by_type{skin});
+        $by_type{concatenated_custom} = _concatenate_css($by_type{custom});
+    }
 
     return \%by_type;
 }
@@ -535,7 +537,7 @@ sub _concatenate_css {
 
 sub _css_url_rewrite {
     my ($source, $url) = @_;
-    # rewrite relative urls as the unified stylesheet lives in a different
+    # rewrite relative urls as the concatenated stylesheet lives in a different
     # directory from the source
     $url =~ s/(^['"]|['"]$)//g;
     if (substr($url, 0, 1) eq '/' || substr($url, 0, 5) eq 'data:') {
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 %]
-- 
cgit v1.2.3-24-g4f1b