aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/Handlers/Hold.py7
-rw-r--r--NEWS3
2 files changed, 5 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
diff --git a/NEWS b/NEWS
index c433caef..d6a162f3 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,9 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - Held message user notifications now come From: list-owner instead of
+ list-bounces. Bug #714424.
+
- Issue an HTTP 404 status for private archive file not found.
- @listname entries in *_these_nonmembers are no longer case sensitive.