------------------------------------------------------------
revno: 1003
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Sun 2007-11-04 15:03:38 -0800
message:
- Cgi/options.py - fixed to not present the "empty" topic to user.
- Handlers/CalcRecips.py - Changed to not process topics if topics
are disabled for the list.
modified:
Mailman/Cgi/options.py
Mailman/Handlers/CalcRecips.py
=== modified file 'Mailman/Cgi/options.py'
--- a/Mailman/Cgi/options.py 2006-08-30 14:54:22 +0000
+++ b/Mailman/Cgi/options.py 2007-11-04 23:03:38 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 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
@@ -797,6 +797,8 @@
if mlist.topics:
table = Table(border="0")
for name, pattern, description, emptyflag in mlist.topics:
+ if emptyflag:
+ continue
quotedname = urllib.quote_plus(name)
details = Link(mlist.GetScriptURL('options') +
'/%s/?VARHELP=%s' % (user, quotedname),
=== modified file 'Mailman/Handlers/CalcRecips.py'
--- a/Mailman/Handlers/CalcRecips.py 2005-08-27 01:40:17 +0000
+++ b/Mailman/Handlers/CalcRecips.py 2007-11-04 23:03:38 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 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
@@ -12,7 +12,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
"""Calculate the regular (i.e. non-digest) recipients of the message.
@@ -91,6 +92,10 @@
def do_topic_filters(mlist, msg, msgdata, recips):
+ if not mlist.topics_enabled:
+ # MAS: if topics are currently disabled for the list, send to all
+ # regardless of ReceiveNonmatchingTopics
+ return
hits = msgdata.get('topichits')
zaprecips = []
if hits:
--
https://code.launchpad.net/~mailman-coders/mailman/2.1
You are receiving this branch notification because you are subscribed to it.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+subscription/mailman-checkins.
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
