From 3ef62a0570055da710328937e7f65dbb2c027c62 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Aug 2002 06:17:09 +0000
Subject: import rt 2.0.14

---
 rt/lib/RT/Action/NotifyAsComment.pm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100755 rt/lib/RT/Action/NotifyAsComment.pm

(limited to 'rt/lib/RT/Action/NotifyAsComment.pm')

diff --git a/rt/lib/RT/Action/NotifyAsComment.pm b/rt/lib/RT/Action/NotifyAsComment.pm
new file mode 100755
index 000000000..c72bfff13
--- /dev/null
+++ b/rt/lib/RT/Action/NotifyAsComment.pm
@@ -0,0 +1,25 @@
+#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/NotifyAsComment.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
+
+package RT::Action::NotifyAsComment;
+require RT::Action::Notify;
+@ISA = qw(RT::Action::Notify);
+
+
+=head2 SetReturnAddress
+
+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));
+}
+1;
+
-- 
cgit v1.2.1


From ded0451e9582df33cae6099a2fb72b4ea25076cf Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 15 Jul 2003 13:30:43 +0000
Subject: reverting to vendor branch rt 3.0.4, hopefully

---
 rt/lib/RT/Action/NotifyAsComment.pm | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'rt/lib/RT/Action/NotifyAsComment.pm')

diff --git a/rt/lib/RT/Action/NotifyAsComment.pm b/rt/lib/RT/Action/NotifyAsComment.pm
index c72bfff13..210e4ab15 100755
--- a/rt/lib/RT/Action/NotifyAsComment.pm
+++ b/rt/lib/RT/Action/NotifyAsComment.pm
@@ -1,7 +1,31 @@
-#$Header: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/NotifyAsComment.pm,v 1.1 2002-08-12 06:17:07 ivan Exp $
-
+# BEGIN LICENSE BLOCK
+# 
+# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# 
+# (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
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+# 
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# 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.
+# 
+# 
+# END LICENSE BLOCK
 package RT::Action::NotifyAsComment;
 require RT::Action::Notify;
+
+use strict;
+use vars qw/@ISA/;
 @ISA = qw(RT::Action::Notify);
 
 
@@ -21,5 +45,11 @@ sub SetReturnAddress {
 	
 	return($self->SUPER::SetReturnAddress(is_comment => 1));
 }
+
+eval "require RT::Action::NotifyAsComment_Vendor";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyAsComment_Vendor.pm});
+eval "require RT::Action::NotifyAsComment_Local";
+die $@ if ($@ && $@ !~ qr{^Can't locate RT/Action/NotifyAsComment_Local.pm});
+
 1;
 
-- 
cgit v1.2.1