From 7cd6bc52c9e9b21cc35fe60bbc8b0c4eabf07154 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Thu, 6 May 2010 21:04:38 -0700
Subject: Fixed Content Filtering collapse_alternatives to work on deeply
 nested multipart/alternative parts.  Bug #576675.

---
 Mailman/Handlers/MimeDel.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Mailman/Handlers')

diff --git a/Mailman/Handlers/MimeDel.py b/Mailman/Handlers/MimeDel.py
index a1a20205..89b03644 100644
--- a/Mailman/Handlers/MimeDel.py
+++ b/Mailman/Handlers/MimeDel.py
@@ -185,6 +185,9 @@ def collapse_multipart_alternatives(msg):
                 newpayload.append(firstalt)
             except (IndexError, TypeError):
                 pass
+        elif subpart.is_multipart():
+            collapse_multipart_alternatives(subpart)
+            newpayload.append(subpart)
         else:
             newpayload.append(subpart)
     msg.set_payload(newpayload)
-- 
cgit v1.2.3