diff options
Diffstat (limited to '')
| -rwxr-xr-x | Mailman/Handlers/CookHeaders.py | 14 | ||||
| -rw-r--r-- | NEWS | 5 |
2 files changed, 13 insertions, 6 deletions
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py index 84d3032d..3e2806f0 100755 --- a/Mailman/Handlers/CookHeaders.py +++ b/Mailman/Handlers/CookHeaders.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -423,9 +423,11 @@ def prefix_subject(mlist, msg, msgdata): recolon = 'Re:' else: recolon = '' + # Strip leading and trailing whitespace from subject. + subject = subject.strip() # At this point, subject may become null if someone post mail with - # subject: [subject prefix] - if subject.strip() == '': + # Subject: [subject prefix] + if subject == '': # We want the i18n context to be the list's preferred_language. It # could be the poster's. otrans = i18n.get_translation() @@ -462,10 +464,10 @@ def prefix_subject(mlist, msg, msgdata): pass # Get the header as a Header instance, with proper unicode conversion # Because of rfc2047 encoding, spaces between encoded words can be - # insignificant, so we need to append a space to prefix but only when - # we have Re:. + # insignificant, so we need to append spaces to our encoded stuff. + prefix += ' ' if recolon: - prefix += ' ' + recolon += ' ' if old_style: h = uheader(mlist, recolon, 'Subject', continuation_ws=ws) h.append(prefix) @@ -32,6 +32,11 @@ Here is a history of user visible changes to Mailman. Bug fixes and other patches + - Subject prefixing has been improved to always have a space between + the prefix and the subject even with non-ascii in the prefix. This + will sometimes result in two spaces when the prefix is non-ascii but + the subject is ascii, but this is the lesser evil. (LP: #1525954) + - Treat message and digest headers and footers as empty if they contain only whitespace. (LP: #1673307) |