From e185be2238bfd1fb2ca6f36b80c9ad93281fe635 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Tue, 3 Jul 2012 22:43:49 -0700 Subject: [PATCH] remove addl_comp_root.pl support --- FS/FS/Mason.pm | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index 9bd0cc305..f3b594256 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -514,28 +514,7 @@ sub mason_interps { RT::LoadConfig(); } - # A hook supporting strange legacy ways people (well, SG) have added stuff on - - my @addl_comp_root = (); - my $addl_comp_root_file = '%%%FREESIDE_CONF%%%/addl_comp_root.pl'; - if ( -e $addl_comp_root_file ) { - warn "reading $addl_comp_root_file\n"; - my $text = slurp( $addl_comp_root_file ); - my @addl = eval $text; - if ( @addl && ! $@ ) { - @addl_comp_root = @addl; - } elsif ($@) { - warn "error parsing $addl_comp_root_file: $@\n"; - } - } - - my $fs_comp_root = - scalar(@addl_comp_root) - ? [ - [ 'freeside'=>'%%%FREESIDE_DOCUMENT_ROOT%%%' ], - @addl_comp_root, - ] - : '%%%FREESIDE_DOCUMENT_ROOT%%%'; + my $fs_comp_root = '%%%FREESIDE_DOCUMENT_ROOT%%%'; my %interp = ( request_class => $request_class, -- 2.11.0