X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FAction%2FRecordComment.pm;h=8ec0b0edf39e314d68e94bf6e0c1d3627ff096ec;hb=7322f2afedcc2f427e997d1535a503613a83f088;hp=ccec8fab30696286c57ec47678250b5bbfab5e24;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/rt/lib/RT/Action/RecordComment.pm b/rt/lib/RT/Action/RecordComment.pm
index ccec8fab3..8ec0b0edf 100644
--- a/rt/lib/RT/Action/RecordComment.pm
+++ b/rt/lib/RT/Action/RecordComment.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -49,6 +49,7 @@
 package RT::Action::RecordComment;
 use base 'RT::Action';
 use strict;
+use warnings;
 
 =head1 NAME
 
@@ -58,11 +59,12 @@ been started, to make a comment on the ticket.
 
 =head1 SYNOPSIS
 
-my $action_obj = RT::Action::RecordComment->new('TicketObj'   => $ticket_obj,
-						'TemplateObj' => $template_obj,
-						);
-my $result = $action_obj->Prepare();
-$action_obj->Commit() if $result;
+    my $action_obj = RT::Action::RecordComment->new(
+        'TicketObj'   => $ticket_obj,
+        'TemplateObj' => $template_obj,
+    );
+    my $result = $action_obj->Prepare();
+    $action_obj->Commit() if $result;
 
 =head1 METHODS
 
@@ -78,8 +80,8 @@ will give us a loop.
 sub Prepare {
     my $self = shift;
     if (defined $self->{'TransactionObj'} &&
-	$self->{'TransactionObj'}->Type =~ /^(Comment|Correspond)$/) {
-	return undef;
+        $self->{'TransactionObj'}->Type =~ /^(Comment|Correspond)$/) {
+        return undef;
     }
     return 1;
 }
@@ -102,18 +104,15 @@ sub CreateTransaction {
     my $self = shift;
 
     my ($result, $msg) = $self->{'TemplateObj'}->Parse(
-	TicketObj => $self->{'TicketObj'});
+        TicketObj => $self->{'TicketObj'});
     return undef unless $result;
-    
+
     my ($trans, $desc, $transaction) = $self->{'TicketObj'}->Comment(
-	MIMEObj => $self->TemplateObj->MIMEObj);
+        MIMEObj => $self->TemplateObj->MIMEObj);
     $self->{'TransactionObj'} = $transaction;
 }
-    
 
-eval "require RT::Action::RecordComment_Vendor";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/RecordComment_Vendor.pm});
-eval "require RT::Action::RecordComment_Local";
-die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/RecordComment_Local.pm});
+
+RT::Base->_ImportOverlays();
 
 1;