aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <msapiro@value.net>2011-11-29 16:48:10 -0800
committerMark Sapiro <msapiro@value.net>2011-11-29 16:48:10 -0800
commitbc15f242a5910584d5f5e6c4667b9a72891b9548 (patch)
treed26351562918d4befcd47a8074be01615647e111
parent161af3750cc58ee48b26b68406ea3e6b931ac0a8 (diff)
downloadmailman2-bc15f242a5910584d5f5e6c4667b9a72891b9548.tar.gz
mailman2-bc15f242a5910584d5f5e6c4667b9a72891b9548.tar.xz
mailman2-bc15f242a5910584d5f5e6c4667b9a72891b9548.zip
A held message with a null sender caused a crash in the admindb
interface. This is fixed by changing the sender to <missing>. Bug #897103.
-rwxr-xr-x[-rw-r--r--]Mailman/ListAdmin.py4
-rw-r--r--NEWS4
2 files changed, 7 insertions, 1 deletions
diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py
index 714b2405..4a188057 100644..100755
--- a/Mailman/ListAdmin.py
+++ b/Mailman/ListAdmin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2011 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
@@ -221,6 +221,8 @@ class ListAdmin:
# an additional dictionary of message metadata
#
msgsubject = msg.get('subject', _('(no subject)'))
+ if not sender:
+ sender = _('<missing>')
data = time.time(), sender, msgsubject, reason, filename, msgdata
self.__db[id] = (HELDMSG, data)
return id
diff --git a/NEWS b/NEWS
index 7c751b15..ba957c4a 100644
--- a/NEWS
+++ b/NEWS
@@ -73,6 +73,10 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - A held message with a null sender caused a crash in the admindb
+ interface. This is fixed by changing the sender to <missing>.
+ Bug #897103.
+
- Changed subject prefixing to allow for possible whitespace between an
'Re' and the following colon when determining how to add the prefix.
Bug #893290.