diff options
| -rw-r--r-- | Mailman/Cgi/options.py | 2 | ||||
| -rw-r--r-- | Mailman/Handlers/CalcRecips.py | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index 2f24c112b..9fb008e6a 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -791,6 +791,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 e5acd23fb..588fcb9ad 100644 --- a/Mailman/Handlers/CalcRecips.py +++ b/Mailman/Handlers/CalcRecips.py @@ -91,6 +91,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: |