process(): Simone Piunno's patch to fix header/footer attachment in

multipart/mixed messages.  Don't attach the header if msg_header is
empty (likewise for msg_footer).

1 files changed, 4 insertions, 2 deletions

diff --git a/Mailman/Handlers/Decorate.py b/Mailman/Handlers/Decorate.py
index bfd29aaef..17e79d3af 100644
--- a/Mailman/Handlers/Decorate.py
+++ b/Mailman/Handlers/Decorate.py
@@ -84,8 +84,10 @@ def process(mlist, msg, msgdata):
         payload = msg.get_payload()
         if not isinstance(payload, ListType):
             payload = [payload]
-        payload.append(mimeftr)
-        payload.insert(0, mimehdr)
+        if footer:
+            payload.append(mimeftr)
+        if header:
+            payload.insert(0, mimehdr)
         msg.set_payload(payload)
     elif msg.get_main_type() <> 'multipart':
         # Okay, we've got some 'image/*' or 'audio/*' -like type.  For now, we