From 2017059f64d9b0307382355c381a256a6d24d3bb Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Fri, 7 Feb 2014 15:34:29 -0800 Subject: Changed the message from the confirm CGI to not indicate approval is required for an acceptance of an invitation. --- Mailman/Cgi/confirm.py | 5 +++-- NEWS | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py index 607f1784..99ff43cd 100644 --- a/Mailman/Cgi/confirm.py +++ b/Mailman/Cgi/confirm.py @@ -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 @@ def subscription_prompt(mlist, doc, cookie, userdesc):

Or hit Cancel my subscription request if you no longer want to subscribe to this list.""") + '

' - 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 %(listname)s. diff --git a/NEWS b/NEWS index 9bbfd17e..c35d68d0 100755 --- a/NEWS +++ b/NEWS @@ -14,6 +14,9 @@ Here is a history of user visible changes to Mailman. 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) -- cgit v1.2.3