aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Handlers/CalcRecips.py
diff options
context:
space:
mode:
authorTokio Kikuchi <tkikuchi@is.kochi-u.ac.jp>2007-11-16 11:48:35 +0900
committerTokio Kikuchi <tkikuchi@is.kochi-u.ac.jp>2007-11-16 11:48:35 +0900
commit8f5d8d2eb9e8bf62a598f126419d18eb3163050e (patch)
treee9dd5c5e73bed1b75811ff7614ba6489c2cd48f1 /Mailman/Handlers/CalcRecips.py
parentba98caf52c18dea4ea244c092617677bdbb01015 (diff)
parent70689d7eb61f8c852a6a02be1d65c86cde06bde2 (diff)
downloadmailman2-8f5d8d2eb9e8bf62a598f126419d18eb3163050e.tar.gz
mailman2-8f5d8d2eb9e8bf62a598f126419d18eb3163050e.tar.xz
mailman2-8f5d8d2eb9e8bf62a598f126419d18eb3163050e.zip
merge and commit
Diffstat (limited to '')
-rw-r--r--Mailman/Handlers/CalcRecips.py9
1 files changed, 7 insertions, 2 deletions
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: