------------------------------------------------------------
revno: 1617
fixes bug: https://launchpad.net/bugs/1546679
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Wed 2016-02-17 10:43:31 -0800
message:
  Acknowledge option will now be honored for posts to anonymous lists
modified:
  Mailman/Handlers/Cleanse.py
  Mailman/Handlers/CookHeaders.py
  NEWS


--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1

Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Handlers/Cleanse.py'
--- Mailman/Handlers/Cleanse.py	2015-02-06 20:06:55 +0000
+++ Mailman/Handlers/Cleanse.py	2016-02-17 18:43:31 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2016 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
@@ -60,6 +60,9 @@
     del msg['x-approve']
     # Also remove this header since it can contain a password
     del msg['urgent']
+    # If we're anonymizing, we need to save the sender here, and we may as
+    # well do it for all.
+    msgdata['original_sender'] = msg.get_sender()
     # We remove other headers from anonymous lists
     if mlist.anonymous_list:
         syslog('post', 'post to %s from %s anonymized',

=== modified file 'Mailman/Handlers/CookHeaders.py'
--- Mailman/Handlers/CookHeaders.py	2016-01-21 22:43:42 +0000
+++ Mailman/Handlers/CookHeaders.py	2016-02-17 18:43:31 +0000
@@ -98,7 +98,9 @@
     # message, we want to save some of the information in the msgdata
     # dictionary for later.  Specifically, the sender header will get waxed,
     # but we need it for the Acknowledge module later.
-    msgdata['original_sender'] = msg.get_sender()
+    # We may have already saved it; if so, don't clobber it here.
+    if 'original_sender' not in msgdata:
+        msgdata['original_sender'] = msg.get_sender()
     # VirginRunner sets _fasttrack for internally crafted messages.
     fasttrack = msgdata.get('_fasttrack')
     if not msgdata.get('isdigest') and not fasttrack:

=== modified file 'NEWS'
--- NEWS	2016-02-15 19:51:52 +0000
+++ NEWS	2016-02-17 18:43:31 +0000
@@ -49,6 +49,9 @@
 
   Bug fixes and other patches
 
+    - User's "Acknowledge" option will now be honored for posts to anonymous
+      lists.  (LP: #1546679)
+
     - Fixed a typo in the Non-digest options regular_exclude_ignore
       description thanks to Yasuhito FUTATSUKI.
 

_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to