X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export.pm;h=3f677b2670386f4790ee0e05113f686aec18cbd3;hp=69a0ba5ecc271eae7eb08f8036c2e9a6e1365dd9;hb=c2146ae32fdef80049abfa13098db2d45f3ebdd5;hpb=eef6a940b33921447b792bff7ef479d1c9612993

diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 69a0ba5ec..3f677b267 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -377,31 +377,33 @@ sub option {
   $part_export_option ? $part_export_option->optionvalue : '';
 }
 
-=item rebless
+=item _rebless
 
 Reblesses the object into the FS::part_export::EXPORTTYPE class, where
 EXPORTTYPE is the object's I<exporttype> field.  There should be better docs
-on how to create new exports (and they should live in their own files and be
-autoloaded-on-demand), but until then, see L</NEW EXPORT CLASSES>.
+on how to create new exports, but until then, see L</NEW EXPORT CLASSES>.
 
 =cut
 
-sub rebless {
+sub _rebless {
   my $self = shift;
   my $exporttype = $self->exporttype;
   my $class = ref($self). "::$exporttype";
   eval "use $class;";
-  die $@ if $@;
-  bless($self, $class);
+  #die $@ if $@;
+  bless($self, $class) unless $@;
+  $self;
 }
 
+#these should probably all go away, just let the subclasses define em
+
 =item export_insert SVC_OBJECT
 
 =cut
 
 sub export_insert {
   my $self = shift;
-  $self->rebless;
+  #$self->rebless;
   $self->_export_insert(@_);
 }
 
@@ -420,7 +422,7 @@ sub export_insert {
 
 sub export_replace {
   my $self = shift;
-  $self->rebless;
+  #$self->rebless;
   $self->_export_replace(@_);
 }
 
@@ -430,7 +432,7 @@ sub export_replace {
 
 sub export_delete {
   my $self = shift;
-  $self->rebless;
+  #$self->rebless;
   $self->_export_delete(@_);
 }
 
@@ -440,7 +442,7 @@ sub export_delete {
 
 sub export_suspend {
   my $self = shift;
-  $self->rebless;
+  #$self->rebless;
   $self->_export_suspend(@_);
 }
 
@@ -450,7 +452,7 @@ sub export_suspend {
 
 sub export_unsuspend {
   my $self = shift;
-  $self->rebless;
+  #$self->rebless;
   $self->_export_unsuspend(@_);
 }
 
@@ -533,9 +535,7 @@ sub export_info {
 #}
 
 foreach my $INC ( @INC ) {
-  $INC =~ /^(.*)$/;
-  my $untainted_INC = $1;
-  foreach my $file ( glob("$untainted_INC/FS/part_export/*.pm") ) {
+  foreach my $file ( glob("$INC/FS/part_export/*.pm") ) {
     warn "attempting to load export info from $file\n" if $DEBUG;
     $file =~ /\/(\w+)\.pm$/ or do {
       warn "unrecognized file in $INC/FS/part_export/: $file\n";