diff options
| author | bwarsaw <> | 2003-03-31 21:49:43 +0000 |
|---|---|---|
| committer | bwarsaw <> | 2003-03-31 21:49:43 +0000 |
| commit | de777e10950eed3aff489e74908578b5759003bb (patch) | |
| tree | 10711cb2e58ce6b83faf021b0cd084de58d22bc4 /Mailman/Cgi | |
| parent | fb97bfb122d119977a719f3a33673edaaae5bd37 (diff) | |
| download | mailman2-de777e10950eed3aff489e74908578b5759003bb.tar.gz mailman2-de777e10950eed3aff489e74908578b5759003bb.tar.xz mailman2-de777e10950eed3aff489e74908578b5759003bb.zip | |
Backporting from trunk
Diffstat (limited to 'Mailman/Cgi')
| -rw-r--r-- | Mailman/Cgi/admin.py | 2 | ||||
| -rw-r--r-- | Mailman/Cgi/confirm.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index 1c629c10..17b3919f 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -1234,7 +1234,7 @@ def change_options(mlist, category, subcat, cgidata, doc): # Default is to subscribe subscribe_or_invite = safeint('subscribe_or_invite', 0) invitation = cgidata.getvalue('invitation', '') - digest = 0 + digest = mlist.digest_is_default if not mlist.digestable: digest = 0 if not mlist.nondigestable: diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py index abb0ac29..23a92740 100644 --- a/Mailman/Cgi/confirm.py +++ b/Mailman/Cgi/confirm.py @@ -348,6 +348,11 @@ def subscription_confirm(mlist, doc, cookie, cgidata): address that has already been unsubscribed.''')) except Errors.MMAlreadyAMember: doc.addError(_("You are already a member of this mailing list!")) + except Errors.HostileSubscriptionError: + doc.addError(_("""\ + You were not invited to this mailing list. The invitation has + been discarded, and both list administrators have been + alerted.""")) else: # Use the user's preferred language i18n.set_language(lang) |