diff options
| -rw-r--r-- | Mailman/Cgi/admindb.py | 9 | ||||
| -rw-r--r-- | NEWS | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py index 4513e8e3..639f64cc 100644 --- a/Mailman/Cgi/admindb.py +++ b/Mailman/Cgi/admindb.py @@ -631,7 +631,14 @@ def show_post_requests(mlist, id, info, total, count, form): else: body = EMPTYSTRING.join(lines) # Get message charset and try encode in list charset - mcset = msg.get_param('charset', 'us-ascii').lower() + # We get it from the first text part. + for part in msg.walk(): + if part.get_content_maintype() == 'text': + # Watchout for charset= with no value. + mcset = part.get_content_charset() or 'us-ascii' + break + else: + mcset = 'us-ascii' lcset = Utils.GetCharSet(mlist.preferred_language) if mcset <> lcset: try: @@ -55,6 +55,9 @@ Here is a history of user visible changes to Mailman. Bug Fixes and other patches + - Fixed a problem in admindb.py where the character set for the display of + the message body excerpt was not correctly determined. Bug #779751. + - Prevented setting user passwords with leading/trailing whitespace. Bug #778088. |