From 049ea3d136ca73c82f5aa530f328d2596f8e6090 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 27 May 2014 13:34:53 +0800
Subject: Bug 1014374: backport bug 977969 to bmo (concatenate and slightly
 minify css files)

---
 Bugzilla/Template.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Bugzilla/Template.pm')

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index d36ffd473..b805a5a2c 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -478,13 +478,13 @@ sub _concatenate_css {
         } @sources;
 
     my $cgi_path   = bz_locations()->{cgi_path};
-    my $skins_path = bz_locations()->{skinsdir};
+    my $skins_path = bz_locations()->{assetsdir};
 
     # build minified files
     my @minified;
     foreach my $source (@sources) {
         next unless -e "$cgi_path/$files{$source}";
-        my $file = $skins_path . '/assets/' . md5_hex($source) . '.css';
+        my $file = $skins_path . '/' . md5_hex($source) . '.css';
         if (!-e $file) {
             my $content = read_file("$cgi_path/$files{$source}");
 
@@ -502,7 +502,7 @@ sub _concatenate_css {
     }
 
     # concat files
-    my $file = $skins_path . '/assets/' . md5_hex(join(' ', @sources)) . '.css';
+    my $file = $skins_path . '/' . md5_hex(join(' ', @sources)) . '.css';
     if (!-e $file) {
         my $content = '';
         foreach my $source (@minified) {
-- 
cgit v1.2.3-24-g4f1b