diff options
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Cgi/admin.py | 16 | ||||
| -rw-r--r--[-rwxr-xr-x] | NEWS | 6 |
2 files changed, 12 insertions, 10 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index f3284e17..a1bc8606 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -1436,10 +1436,12 @@ def change_options(mlist, category, subcat, cgidata, doc): removals += cgidata['unsubscribees_upload'].value if removals: names = filter(None, [n.strip() for n in removals.splitlines()]) - send_unsub_notifications = int( - cgidata['send_unsub_notifications_to_list_owner'].value) - userack = int( - cgidata['send_unsub_ack_to_this_batch'].value) + send_unsub_notifications = safeint( + 'send_unsub_notifications_to_list_owner', + mlist.admin_notify_mchanges) + userack = safeint( + 'send_unsub_ack_to_this_batch', + mlist.send_goodbye_msg) unsubscribe_errors = [] unsubscribe_success = [] for addr in names: @@ -1463,11 +1465,7 @@ def change_options(mlist, category, subcat, cgidata, doc): doc.AddItem('<p>') # See if this was a moderation bit operation if cgidata.has_key('allmodbit_btn'): - val = cgidata.getvalue('allmodbit_val') - try: - val = int(val) - except VallueError: - val = None + val = safeint('allmodbit_val') if val not in (0, 1): doc.addError(_('Bad moderation flag value')) else: @@ -5,10 +5,14 @@ Copyright (C) 1998-2011 by the Free Software Foundation, Inc. Here is a history of user visible changes to Mailman. -2.1.15-1 (xx-xxx-xxxx) +2.1.16 (xx-xxx-xxxx) Bug Fixes and other patches + - The query fragments send_unsub_notifications_to_list_owner and + send_unsub_ack_to_this_batch will now assume default values if not set + in mass unsubscribe URLs. (LP: #1032378) + - Replaced utf-8 encoded characters in newly added German templates with HTML entities. (LP: #1018208) |