diff options
| author | Mark Sapiro <msapiro@value.net> | 2007-11-04 15:03:38 -0800 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2007-11-04 15:03:38 -0800 |
| commit | 6684e734f8e271aec3bf63233b19e2a57ce87d98 (patch) | |
| tree | 53fe00b67625284f9bf6e0615d5f5be726d37cc2 /Mailman | |
| parent | 54f06c64004d154746c26aebbd28da65e716f438 (diff) | |
| download | mailman2-6684e734f8e271aec3bf63233b19e2a57ce87d98.tar.gz mailman2-6684e734f8e271aec3bf63233b19e2a57ce87d98.tar.xz mailman2-6684e734f8e271aec3bf63233b19e2a57ce87d98.zip | |
- 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.
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Cgi/options.py | 4 | ||||
| -rw-r--r-- | Mailman/Handlers/CalcRecips.py | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index d423f262..ab19e4e2 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -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 @@ def options_page(mlist, doc, user, cpuser, userlang, message=''): 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), diff --git a/Mailman/Handlers/CalcRecips.py b/Mailman/Handlers/CalcRecips.py index e065ad68..75a8a457 100644 --- a/Mailman/Handlers/CalcRecips.py +++ b/Mailman/Handlers/CalcRecips.py @@ -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 @@ delivery. The original message as received by Mailman is attached. 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: |