aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/Handlers/MimeDel.py3
-rw-r--r--NEWS5
2 files changed, 7 insertions, 1 deletions
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)
diff --git a/NEWS b/NEWS
index a2c6316d..5bfce3c7 100644
--- a/NEWS
+++ b/NEWS
@@ -17,8 +17,11 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - Fixed Content Filtering collapse_alternatives to work on deeply nested
+ multipart/alternative parts. Bug #576675.
+
- We now accept/remove X-Approved: and X-Approve: headers in addition to
- Approved: and Approve: for pre-approving posts. Bug ##557750.
+ Approved: and Approve: for pre-approving posts. Bug #557750.
- Reordered the 'cancel' and 'subscribe' buttons on the subscription
confirmation web page so the default action upon 'enter' will be the