X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rt%2Flib%2FRT%2FAction%2FAutoreply.pm;h=9bf6ab6d3e4f6413e9249a6d19b4ae3f77ce0255;hb=9aee669886202be7035e6c6049fc71bc99dd3013;hp=a412118886a3582893df718f07c1da1e3f1e7fef;hpb=fc6209f398899f0211cfcedeb81a3cd65e04a941;p=freeside.git

diff --git a/rt/lib/RT/Action/Autoreply.pm b/rt/lib/RT/Action/Autoreply.pm
index a41211888..9bf6ab6d3 100755
--- a/rt/lib/RT/Action/Autoreply.pm
+++ b/rt/lib/RT/Action/Autoreply.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2011 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)
@@ -66,7 +66,6 @@ sub Prepare {
     $self->SUPER::Prepare();
 }
 
-# {{{ sub SetRecipients
 
 =head2 SetRecipients
 
@@ -83,34 +82,30 @@ sub SetRecipients {
     return(1);
 }
 
-# }}}
 
 
-# {{{ sub SetReturnAddress 
 
 =head2 SetReturnAddress
 
-Set this message\'s return address to the apropriate queue address
+Set this message's return address to the apropriate queue address
 
 =cut
 
 sub SetReturnAddress {
     my $self = shift;
-    
+
     my $friendly_name;
 
-	if (RT->Config->Get('UseFriendlyFromLine')) {
-	    $friendly_name = $self->TicketObj->QueueObj->Description ||
-		    $self->TicketObj->QueueObj->Name;
-	}
+    if (RT->Config->Get('UseFriendlyFromLine')) {
+        $friendly_name = $self->TicketObj->QueueObj->Description ||
+            $self->TicketObj->QueueObj->Name;
+    }
 
     $self->SUPER::SetReturnAddress( @_, friendly_name => $friendly_name );
-    
+
 }
-  
-# }}}
 
-# {{{{ sub SetRTSpecialHeaders
+
 
 =head2 SetRTSpecialHeaders
 
@@ -125,11 +120,7 @@ sub SetRTSpecialHeaders {
     $self->SetHeader( 'Auto-Submitted', 'auto-replied' );
 }
 
-# }}}
 
-eval "require RT::Action::Autoreply_Vendor";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Autoreply_Vendor.pm});
-eval "require RT::Action::Autoreply_Local";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/Autoreply_Local.pm});
+RT::Base->_ImportOverlays();
 
 1;