From 46e9f93a9abfd95327eb0841cd7496c124eadf20 Mon Sep 17 00:00:00 2001
From: klm
Date: Tue, 14 Apr 1998 21:43:11 +0000
Subject: .DeliverToList(): Was missing a newline between message headers and
 body, so initial body lines that looked like header would be incorporated in
 header.

---
 modules/mm_deliver.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'modules')

diff --git a/modules/mm_deliver.py b/modules/mm_deliver.py
index 521cb1ccc..66c4b5fe6 100644
--- a/modules/mm_deliver.py
+++ b/modules/mm_deliver.py
@@ -1,6 +1,6 @@
 """Mixin class with message delivery routines."""
 
-__version__ = "$Revision: 453 $"
+__version__ = "$Revision: 456 $"
 
 
 import string, os, sys, tempfile
@@ -122,17 +122,15 @@ class Deliverer:
 	    msg.headers.append('To: %s\n' % self.GetListEmail())
  	else:
             tempfile.template = tmpfile_prefix + 'mailman.'
+	if self.reply_goes_to_list:
+            msg.headers.append('Reply-To: %s\n' % self.GetListEmail())
 	msg.headers.append('Errors-To: %s\n' % self.GetAdminEmail())
 
         tmp_file_name = tempfile.mktemp()
  	tmp_file = open(tmp_file_name, 'w+')
+ 	tmp_file.write(string.join(msg.headers,'') + '\n')
 
- 	tmp_file.write(string.join(msg.headers,''))
-	# If replys don't go to the list, then they should go to the
-	# real sender
-	if self.reply_goes_to_list:
-	    tmp_file.write('Reply-To: %s\n\n' % self.GetListEmail())
-	if header:
+	if header:                      # The *body* header:
 	    tmp_file.write(header + '\n')
 	tmp_file.write(self.QuotePeriods(msg.body))
 	if footer:
-- 
cgit v1.3.1