diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-02-18 18:32:15 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-02-18 18:32:15 +0900 |
| commit | bcc413de55d2f56e4a5872b610637787539d928d (patch) | |
| tree | ebc77ed11f19ebc8e4ad9b2b53c5c77359577f6f /Mailman/Handlers/CookHeaders.py | |
| parent | 46bd46376268f9657f20af251406a14eb0443aba (diff) | |
| parent | 9eecc5d5d26373741ba5dfc03872098c3a6e602c (diff) | |
| download | mailman2-bcc413de55d2f56e4a5872b610637787539d928d.tar.gz mailman2-bcc413de55d2f56e4a5872b610637787539d928d.tar.xz mailman2-bcc413de55d2f56e4a5872b610637787539d928d.zip | |
Merge lp:mailman/2.1 rev 1617
Diffstat (limited to 'Mailman/Handlers/CookHeaders.py')
| -rwxr-xr-x | Mailman/Handlers/CookHeaders.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py index 8b371b77..59eb67b7 100755 --- a/Mailman/Handlers/CookHeaders.py +++ b/Mailman/Handlers/CookHeaders.py @@ -98,7 +98,9 @@ def process(mlist, msg, msgdata): # 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: |