diff options
| author | Mark Sapiro <msapiro@value.net> | 2011-02-07 12:09:54 -0800 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2011-02-07 12:09:54 -0800 |
| commit | 12f54c4b4f27ed1514f770f062bcc9c5b239dd71 (patch) | |
| tree | 16c5bb4281fdc5aa01e84e9fa50c459057edd872 /Mailman/Handlers/Hold.py | |
| parent | ea9bee8858f3a9940412164e0908bc7d12614063 (diff) | |
| download | mailman2-12f54c4b4f27ed1514f770f062bcc9c5b239dd71.tar.gz mailman2-12f54c4b4f27ed1514f770f062bcc9c5b239dd71.tar.xz mailman2-12f54c4b4f27ed1514f770f062bcc9c5b239dd71.zip | |
- Held message user notifications now come From: list-owner instead of
list-bounces. Bug #714424.
Diffstat (limited to 'Mailman/Handlers/Hold.py')
| -rw-r--r-- | Mailman/Handlers/Hold.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Mailman/Handlers/Hold.py b/Mailman/Handlers/Hold.py index 2b8a084d..5452d06a 100644 --- a/Mailman/Handlers/Hold.py +++ b/Mailman/Handlers/Hold.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2011 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 @@ -237,9 +237,6 @@ def hold_for_approval(mlist, msg, msgdata, exc): # languages (the user's preferred and the list's preferred for the admin), # we need to play some i18n games here. Since the current language # context ought to be set up for the user, let's craft his message first. - # - # This message should appear to come from <list>-admin so as to handle any - # bounce processing that might be needed. cookie = mlist.pend_new(Pending.HELD_MESSAGE, id) if not fromusenet and ackp(msg) and mlist.respond_to_post_requests and \ mlist.autorespondToSender(sender, mlist.getMemberLanguage(sender)): @@ -249,7 +246,7 @@ def hold_for_approval(mlist, msg, msgdata, exc): lang = msgdata.get('lang', mlist.getMemberLanguage(sender)) subject = _('Your message to %(listname)s awaits moderator approval') text = Utils.maketext('postheld.txt', d, lang=lang, mlist=mlist) - nmsg = Message.UserNotification(sender, adminaddr, subject, text, lang) + nmsg = Message.UserNotification(sender, owneraddr, subject, text, lang) nmsg.send(mlist) # Now the message for the list owners. Be sure to include the list # moderators in this message. This one should appear to come from |