diff options
| author | Mark Sapiro <mark@msapiro.net> | 2009-02-03 15:47:36 -0800 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2009-02-03 15:47:36 -0800 |
| commit | 72a92d86b495602c214a27e09f55f338787331c1 (patch) | |
| tree | 474798b1ef127ded4c0f260fb0daf0a5314716e0 | |
| parent | 748e430b3d8040e8ef8905fcfc2cc554dc8c09f9 (diff) | |
| download | mailman2-72a92d86b495602c214a27e09f55f338787331c1.tar.gz mailman2-72a92d86b495602c214a27e09f55f338787331c1.tar.xz mailman2-72a92d86b495602c214a27e09f55f338787331c1.zip | |
Fixed a bug in admindb.py in the implementation of replacing "No Reason
Given" with the default rejection reason. Bug #325016.
| -rw-r--r-- | Mailman/Cgi/admindb.py | 9 | ||||
| -rw-r--r-- | NEWS | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py index a20763f1..117923e0 100644 --- a/Mailman/Cgi/admindb.py +++ b/Mailman/Cgi/admindb.py @@ -34,6 +34,7 @@ from Mailman import Errors from Mailman import Message from Mailman import i18n from Mailman.Handlers.Moderate import ModeratedMemberPost +from Mailman.ListAdmin import HELDMSG from Mailman.ListAdmin import readMessage from Mailman.Cgi import Auth from Mailman.htmlformat import * @@ -769,8 +770,12 @@ def process_form(mlist, doc, cgidata): forwardaddrkey = 'forward-addr-%d' % request_id bankey = 'ban-%d' % request_id # Defaults - msgdata = mlist.GetRecord(request_id)[5] - comment = msgdata.get('rejection_notice', _('[No explanation given]')) + if mlist.GetRecordType(request_id) == HELDMSG: + msgdata = mlist.GetRecord(request_id)[5] + comment = msgdata.get('rejection_notice', + _('[No explanation given]')) + else: + comment = _('[No explanation given]') preserve = 0 forward = 0 forwardaddr = '' @@ -82,6 +82,9 @@ Here is a history of user visible changes to Mailman. - Changed scripts/driver to return a 405 status for non GET, POST, HEAD methods. SF patch #1578756. + - Fixed a bug in admindb.py in the implementation of replacing "No Reason + Given" with the default rejection reason. Bug #325016. + 2.1.11 (30-Jun-2008) New Features |