diff options
author | Byron Jones <glob@mozilla.com> | 2014-05-27 07:34:53 +0200 |
---|---|---|
committer | Byron Jones <glob@mozilla.com> | 2014-05-27 07:34:53 +0200 |
commit | 049ea3d136ca73c82f5aa530f328d2596f8e6090 (patch) | |
tree | 892b9c5f78d1ca9e5e195eaacb641ad52ee6599b /Bugzilla/Template.pm | |
parent | 612ab3f079cb9f716581c37d52804d2da0422929 (diff) | |
download | bugzilla-049ea3d136ca73c82f5aa530f328d2596f8e6090.tar.gz bugzilla-049ea3d136ca73c82f5aa530f328d2596f8e6090.tar.xz |
Bug 1014374: backport bug 977969 to bmo (concatenate and slightly minify css files)
Diffstat (limited to 'Bugzilla/Template.pm')
-rw-r--r-- | Bugzilla/Template.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |