------------------------------------------------------------
revno: 1445
fixes bug: https://launchpad.net/bugs/1277744
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Fri 2014-02-07 15:34:29 -0800
message:
Changed the message from the confirm CGI to not indicate approval is
required for an acceptance of an invitation.
modified:
Mailman/Cgi/confirm.py
NEWS
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Cgi/confirm.py'
--- Mailman/Cgi/confirm.py 2011-02-19 01:33:50 +0000
+++ Mailman/Cgi/confirm.py 2014-02-07 23:34:29 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -258,7 +258,8 @@
<p>Or hit <em>Cancel my subscription request</em> if you no longer want to
subscribe to this list.""") + '<p><hr>'
- if mlist.subscribe_policy in (2, 3):
+ if (mlist.subscribe_policy in (2, 3) and
+ not getattr(userdesc, 'invitation', False)):
# Confirmation is required
result = _("""Your confirmation is required in order to continue with
the subscription request to the mailing list <em>%(listname)s</em>.
=== modified file 'NEWS'
--- NEWS 2014-02-04 01:01:49 +0000
+++ NEWS 2014-02-07 23:34:29 +0000
@@ -14,6 +14,9 @@
Bug Fixes and other patches
+ - Changed the message from the confirm CGI to not indicate approval is
+ required for an acceptance of an invitation. (LP: #1277744)
+
- Fixed POSTFIX_STYLE_VIRTUAL_DOMAINS to be case-insensitiive.
(LP: #1267003)
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
