[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Setup.pm,1.53,1.54

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6101

Modified Files:
	Setup.pm 
Log Message:
don't try to include SiteTemplate at startup (it's part of a package)


Index: Setup.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Setup.pm,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** Setup.pm	31 Oct 2004 00:24:59 -0000	1.53
--- Setup.pm	5 Dec 2004 20:54:03 -0000	1.54
***************
*** 617,622 ****
      # first read the system classes...
  
!     my $system_classes = CTX->lookup_class;
!     return $self->require_module({ class => [ values %{ $system_classes } ] });
  }
  
--- 617,628 ----
      # first read the system classes...
  
!     my $conf_system_classes = CTX->lookup_class;
! 
!     # TODO: fix this (don't include 'template' class in 'system_class'?)
!     # Don't include the SiteTemplate file at startup because it gets
!     # copied later to the tmplib and included
!     my @system_classes = grep { $_ ne 'OpenInteract2::SiteTemplate' }
!                               values %{ $conf_system_classes };
!     return $self->require_module({ class => \@system_classes });
  }