aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2008-06-20 12:49:24 -0700
committerMark Sapiro <mark@msapiro.net>2008-06-20 12:49:24 -0700
commitfb79444a20297f9a98c1e515527de757e00cda56 (patch)
tree1b5b170cbfb986713388646bb306b32b32ae2c03
parenta7ac3c24ba6affeb3fdde672e16389136e2a2820 (diff)
downloadmailman2-fb79444a20297f9a98c1e515527de757e00cda56.tar.gz
mailman2-fb79444a20297f9a98c1e515527de757e00cda56.tar.xz
mailman2-fb79444a20297f9a98c1e515527de757e00cda56.zip
Fixed CookHeaders.py which in some cases with new style prefixing
would insert an extra space between the prefix and the subject.
-rw-r--r--Mailman/Handlers/CookHeaders.py5
-rw-r--r--NEWS9
2 files changed, 12 insertions, 2 deletions
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index 671922ab..3483225e 100644
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -298,7 +298,10 @@ def prefix_subject(mlist, msg, msgdata):
if old_style:
h = u' '.join([recolon, prefix, subject])
else:
- h = u' '.join([prefix, recolon, subject])
+ if recolon:
+ h = u' '.join([prefix, recolon, subject])
+ else:
+ h = u' '.join([prefix, subject])
h = h.encode('us-ascii')
h = uheader(mlist, h, 'Subject', continuation_ws=ws)
del msg['subject']
diff --git a/NEWS b/NEWS
index d6b2e49a..6b52e07b 100644
--- a/NEWS
+++ b/NEWS
@@ -55,7 +55,7 @@ Here is a history of user visible changes to Mailman.
- Fixed unescaped '%' in templates/nl/newlist.txt (1719017).
- - Changed some non-ascii characters in templates/de/*.html to HTML
+ - Changed non-ascii characters in some templates/*/*.html files to HTML
entities.
- Fixed a problem in Decorate.py that could result in a multipart
@@ -63,6 +63,13 @@ Here is a history of user visible changes to Mailman.
- Improved recognition of some bounce messages.
+ - Rearranged calls to the list setBounceInfo() method in Bouncer.py
+ to accommodate MemberAdaptors that store bounce info outside the
+ list instance.
+
+ - Fixed CookHeaders.py which in some cases with new style prefixing
+ would insert an extra space between the prefix and the subject.
+
Miscellaneous
- Brad Knowles' mailman daily status report script updated to 0.0.18.