aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2010-05-10 14:11:45 -0700
committerMark Sapiro <mark@msapiro.net>2010-05-10 14:11:45 -0700
commit19d9f08506570461788033406ea7f662f3f21aeb (patch)
treec665860258365c63200a0d8e3e2befa80e360ce3
parent7cd6bc52c9e9b21cc35fe60bbc8b0c4eabf07154 (diff)
downloadmailman2-19d9f08506570461788033406ea7f662f3f21aeb.tar.gz
mailman2-19d9f08506570461788033406ea7f662f3f21aeb.tar.xz
mailman2-19d9f08506570461788033406ea7f662f3f21aeb.zip
Made a minor change to the removal of an Approved: pseudo-header from
a text/html alternative to allow for an inserted '\xA0' before the password.
-rw-r--r--Mailman/Handlers/Approve.py2
-rw-r--r--NEWS4
2 files changed, 5 insertions, 1 deletions
diff --git a/Mailman/Handlers/Approve.py b/Mailman/Handlers/Approve.py
index ed85395d..68f23cf1 100644
--- a/Mailman/Handlers/Approve.py
+++ b/Mailman/Handlers/Approve.py
@@ -111,7 +111,7 @@ def process(mlist, msg, msgdata):
# line of HTML or other fancy text may include additional message
# text. This pattern works with HTML. It may not work with rtf
# or whatever else is possible.
- pattern = name + ':(\s|&nbsp;)*' + re.escape(passwd)
+ pattern = name + ':(\xA0|\s|&nbsp;)*' + re.escape(passwd)
for part in typed_subpart_iterator(msg, 'text'):
if part is not None and part.get_payload() is not None:
lines = part.get_payload(decode=True)
diff --git a/NEWS b/NEWS
index 5bfce3c7..b6cfa280 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,10 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - Made a minor change to the removal of an Approved: pseudo-header from
+ a text/html alternative to allow for an inserted '\xA0' before the
+ password.
+
- Fixed Content Filtering collapse_alternatives to work on deeply nested
multipart/alternative parts. Bug #576675.