aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/Cgi/admindb.py9
-rw-r--r--NEWS3
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 = ''
diff --git a/NEWS b/NEWS
index 761eec1d..6a715b46 100644
--- a/NEWS
+++ b/NEWS
@@ -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