Update of /cvsroot/mailman/mailman/Mailman/Cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv24139/Mailman/Cgi

Modified Files:
      Tag: Release_2_1-maint
        admin.py confirm.py 
Log Message:
Backporting from trunk





Index: admin.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/admin.py,v
retrieving revision 2.86.2.1
retrieving revision 2.86.2.2
diff -u -d -r2.86.2.1 -r2.86.2.2
--- admin.py    8 Feb 2003 07:13:49 -0000       2.86.2.1
+++ admin.py    31 Mar 2003 21:49:40 -0000      2.86.2.2
@@ -1234,7 +1234,7 @@
         # 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:

Index: confirm.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/confirm.py,v
retrieving revision 2.31.2.1
retrieving revision 2.31.2.2
diff -u -d -r2.31.2.1 -r2.31.2.2
--- confirm.py  8 Feb 2003 07:13:49 -0000       2.31.2.1
+++ confirm.py  31 Mar 2003 21:49:41 -0000      2.31.2.2
@@ -348,6 +348,11 @@
             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)



_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins

Reply via email to