fix construction of individual messages to nosy recipents with attachments

Author: Richard Jones

CHANGES.txt

@@ -12,6 +12,8 @@ Fixes:
   see http://thread.gmane.org/gmane.comp.bug-tracking.roundup.user/9500
 - fix problem with bounce-message if incoming mail has insufficient
   privilege, e.g., user not existing (issue 2550534)
+- fix construction of individual messages to nosy recipents with
+  attachments (issue 2550568)
 
 
 2009-03-18 1.4.8 (r4209)

roundup/roundupdb.py

@@ -372,7 +372,7 @@ def send_message(self, nodeid, msgid, note, sendto, from_address=None,
         charset = getattr(self.db.config, 'EMAIL_CHARSET', 'utf-8')
 
         # construct the content and convert to unicode object
-        content = unicode('\n'.join(m), 'utf-8').encode(charset)
+        body = unicode('\n'.join(m), 'utf-8').encode(charset)
 
         # make sure the To line is always the same (for testing mostly)
         sendto.sort()
@@ -459,7 +459,7 @@ def send_message(self, nodeid, msgid, note, sendto, from_address=None,
             # attach files
             if message_files:
                 # first up the text as a part
-                part = MIMEText(content)
+                part = MIMEText(body)
                 encode_quopri(part)
                 message.attach(part)
 
@@ -494,7 +494,7 @@ def send_message(self, nodeid, msgid, note, sendto, from_address=None,
                     message.attach(part)
 
             else:
-                message.set_payload(content)
+                message.set_payload(body)
                 encode_quopri(message)
 
             if first: