aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <msapiro@value.net>2012-03-27 15:16:34 -0700
committerMark Sapiro <msapiro@value.net>2012-03-27 15:16:34 -0700
commit8699637987a4632428f56e7eafa8aa3f4dcf2e30 (patch)
treef970de758eff45c345c87b2bd2219b2e5761c60c
parent7cce1a8d4d63e75c110dddd1bd83ecef34bbc769 (diff)
downloadmailman2-8699637987a4632428f56e7eafa8aa3f4dcf2e30.tar.gz
mailman2-8699637987a4632428f56e7eafa8aa3f4dcf2e30.tar.xz
mailman2-8699637987a4632428f56e7eafa8aa3f4dcf2e30.zip
Fixed a potential crash in the web UI if a language is removed from the
LC_DESCRIPTIONS dictionary. (LP: #966565)
-rw-r--r--Mailman/htmlformat.py2
-rw-r--r--NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Mailman/htmlformat.py b/Mailman/htmlformat.py
index 5d70ad28..2387096e 100644
--- a/Mailman/htmlformat.py
+++ b/Mailman/htmlformat.py
@@ -300,7 +300,7 @@ class Document(Container):
def Format(self, indent=0, **kws):
charset = 'us-ascii'
- if self.language:
+ if self.language and Utils.IsLanguage(self.language):
charset = Utils.GetCharSet(self.language)
output = ['Content-Type: text/html; charset=%s\n' % charset]
if not self.suppress_head:
diff --git a/NEWS b/NEWS
index 40dcf284..ebf2f9ce 100644
--- a/NEWS
+++ b/NEWS
@@ -98,6 +98,9 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - Fixed a potential crash in the web UI if a language is removed from the
+ LC_DESCRIPTIONS dictionary. (LP: #966565)
+
- Added an Auto-Submitted: header to invitations and (un)subscription
confirmation requests to reduce the possibility of an autoresponder
confirming the request. (LP: #265831)