diff options
Diffstat (limited to 'rt/lib/RT/Squish/JS.pm')
-rw-r--r-- | rt/lib/RT/Squish/JS.pm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/rt/lib/RT/Squish/JS.pm b/rt/lib/RT/Squish/JS.pm index 5445689ea..c44f45570 100644 --- a/rt/lib/RT/Squish/JS.pm +++ b/rt/lib/RT/Squish/JS.pm @@ -73,14 +73,16 @@ not only concatenate files, but also minify them sub Squish { my $self = shift; - my $content; + my $content = ""; - for my $file ( RT->Config->Get('JSFiles') ) { - my $path = "/NoAuth/js/$file"; - if ( $HTML::Mason::Commands::m->comp_exists($path) ) { - $content .= $HTML::Mason::Commands::m->scomp($path); + for my $file ( RT::Interface::Web->JSFiles ) { + my $uri = $file =~ m{^/} ? $file : "/static/js/$file"; + my $res = RT::Interface::Web::Handler->GetStatic($uri); + + if ($res->is_success) { + $content .= $res->decoded_content; } else { - RT->Logger->error("Unable to open $path for JS Squishing"); + RT->Logger->error("Unable to fetch $uri for JS Squishing: " . $res->status_line); next; } } |