[interchange-cvs] interchange - racke modified code/UserTag/email.tag

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2005-10-14 13:04:05 GMT
Modified:  code/UserTag email.tag
Log:
fix garbled subject if reply is set, the newline is important

Revision  Changes    Path
1.10      +4 -3      interchange/code/UserTag/email.tag


rev 1.10, prev_rev 1.9
Index: email.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/email.tag,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- email.tag	28 Sep 2005 22:07:24 -0000	1.9
+++ email.tag	14 Oct 2005 13:04:05 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 2002 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: email.tag,v 1.9 2005/09/28 22:07:24 jon Exp $
+# $Id: email.tag,v 1.10 2005/10/14 13:04:05 racke Exp $
 
 UserTag email Order to subject reply from extra
 UserTag email hasEndTag
@@ -25,8 +25,6 @@
 
     $subject = '<no subject>' unless defined $subject && $subject;
 
-    $reply = '' unless defined $reply;
-    $reply = "Reply-to: $reply\n" if $reply;
 	if (! $from) {
 		$from = $Vend::Cfg->{MailOrderTo};
 		$from =~ s/,.*//;
@@ -40,6 +38,9 @@
 		s/[\r\n](.*)//s
 			and ::logError("Header injection attempted in email tag: %s", $1);
 	}
+
+    $reply = '' unless defined $reply;
+    $reply = "Reply-to: $reply\n" if $reply;
 
 	for (grep /\S/, split /[\r\n]+/, $extra) {
 		# require header conformance with RFC 2822 section 2.2