Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x

1 files changed, 3 insertions, 22 deletions

diff --git a/rt/lib/RT/Squish/CSS.pm b/rt/lib/RT/Squish/CSS.pm
index 5ce3882cd..ccfbc27ec 100644
--- a/rt/lib/RT/Squish/CSS.pm
+++ b/rt/lib/RT/Squish/CSS.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -78,27 +78,8 @@ sub Squish {
     return $self->concatenate( "$style/main.css", RT->Config->Get('CSSFiles') );
 }
 
-=head2 file_handle
-
-subclass CSS::Squish::file_handle for RT
-
-=cut
-
-sub file_handle {
-    my $self    = shift;
-    my $file    = shift;
-
-    my $path = "/NoAuth/css/$file";
-    my $content;
-    if ( $HTML::Mason::Commands::m->comp_exists($path) ) {
-        $content = $HTML::Mason::Commands::m->scomp("$path");
-    } else {
-        RT->Logger->error("Unable to open $path for CSS Squishing");
-        return undef;
-    }
-
-    open( my $fh, '<', \$content ) or die $!;
-    return $fh;
+sub roots {
+    map { "$_/css" } RT::Interface::Web->StaticRoots
 }
 
 1;