This commit was generated by cvs2svn to compensate for changes in r12472,

[freeside.git] / rt / lib / RT / Action / NotifyAsComment.pm

diff --git a/rt/lib/RT/Action/NotifyAsComment.pm b/rt/lib/RT/Action/NotifyAsComment.pm
index 4380c86..210e4ab 100755 (executable)
--- a/rt/lib/RT/Action/NotifyAsComment.pm
+++ b/rt/lib/RT/Action/NotifyAsComment.pm
@@ -1,14 +1,8 @@
-# BEGIN BPS TAGGED BLOCK {{{
+# BEGIN LICENSE BLOCK
 # 
-# COPYRIGHT:
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
 # 
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-#                                          <jesse@bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
+# (Except where explictly superceded by other copyright notices)
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -20,54 +14,36 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
+# Unless otherwise specified, all modifications, corrections or
+# extensions to this work which alter its source code become the
+# property of Best Practical Solutions, LLC when submitted for
+# inclusion in the work.
 # 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
 # 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-
+# END LICENSE BLOCK
 package RT::Action::NotifyAsComment;
+require RT::Action::Notify;
 
 use strict;
-use warnings;
+use vars qw/@ISA/;
+@ISA = qw(RT::Action::Notify);
 
-use base qw(RT::Action::Notify);
 
 =head2 SetReturnAddress
 
-Tell SendEmail that this message should come out as a comment.
+Tell SendEmail that this message should come out as a comment. 
 Calls SUPER::SetReturnAddress.
 
 =cut
 
 sub SetReturnAddress {
-    my $self = shift;
-
-    # Tell RT::Action::SendEmail that this should come
-    # from the relevant comment email address.
-    $self->{'comment'} = 1;
-
-    return $self->SUPER::SetReturnAddress( @_, is_comment => 1 );
+       my $self = shift;
+       
+       # Tell RT::Action::SendEmail that this should come 
+       # from the relevant comment email address.
+       $self->{'comment'} = 1;
+       
+       return($self->SUPER::SetReturnAddress(is_comment => 1));
 }
 
 eval "require RT::Action::NotifyAsComment_Vendor";
@@ -76,3 +52,4 @@ eval "require RT::Action::NotifyAsComment_Local";
 die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyAsComment_Local.pm});
 
 1;
+