projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
rt
/
lib
/
RT
/
Action
/
Autoreply.pm
diff --git
a/rt/lib/RT/Action/Autoreply.pm
b/rt/lib/RT/Action/Autoreply.pm
index
a412118
..
9bf6ab6
100755
(executable)
--- a/
rt/lib/RT/Action/Autoreply.pm
+++ b/
rt/lib/RT/Action/Autoreply.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
5
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-66,7
+66,6
@@
sub Prepare {
$self->SUPER::Prepare();
}
$self->SUPER::Prepare();
}
-# {{{ sub SetRecipients
=head2 SetRecipients
=head2 SetRecipients
@@
-83,34
+82,30
@@
sub SetRecipients {
return(1);
}
return(1);
}
-# }}}
-# {{{ sub SetReturnAddress
=head2 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;
=cut
sub SetReturnAddress {
my $self = shift;
-
+
my $friendly_name;
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 );
$self->SUPER::SetReturnAddress( @_, friendly_name => $friendly_name );
-
+
}
}
-
-# }}}
-# {{{{ sub SetRTSpecialHeaders
+
=head2 SetRTSpecialHeaders
=head2 SetRTSpecialHeaders
@@
-125,11
+120,7
@@
sub SetRTSpecialHeaders {
$self->SetHeader( 'Auto-Submitted', 'auto-replied' );
}
$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;
1;