[freeside-commits] branch master updated. e185be2238bfd1fb2ca6f36b80c9ad93281fe635

[Ivan]

The branch, master has been updated
       via  e185be2238bfd1fb2ca6f36b80c9ad93281fe635 (commit)
      from  e4a77af2829e919d29de26e3f15f416b41bd5199 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e185be2238bfd1fb2ca6f36b80c9ad93281fe635
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Jul 3 22:43:49 2012 -0700

    remove addl_comp_root.pl support

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 9bd0cc3..f3b5942 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,

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Mason.pm |   23 +----------------------
 1 files changed, 1 insertions(+), 22 deletions(-)