aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2010-05-06 21:04:38 -0700
committerMark Sapiro <mark@msapiro.net>2010-05-06 21:04:38 -0700
commit7cd6bc52c9e9b21cc35fe60bbc8b0c4eabf07154 (patch)
tree504d208a82e26ad070623c4492b5a6e8787a61c8 /Mailman
parentbc1e9bf57db2f23a2f98cb679034b15e593d8020 (diff)
downloadmailman2-7cd6bc52c9e9b21cc35fe60bbc8b0c4eabf07154.tar.gz
mailman2-7cd6bc52c9e9b21cc35fe60bbc8b0c4eabf07154.tar.xz
mailman2-7cd6bc52c9e9b21cc35fe60bbc8b0c4eabf07154.zip
Fixed Content Filtering collapse_alternatives to work on deeply nested
multipart/alternative parts. Bug #576675.
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Handlers/MimeDel.py3
1 files changed, 3 insertions, 0 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)