From 7cd6bc52c9e9b21cc35fe60bbc8b0c4eabf07154 Mon Sep 17 00:00:00 2001 From: Mark Sapiro 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 +++ NEWS | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3