diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-03-02 18:57:16 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-03-02 18:57:16 +0900 |
| commit | 3d3ed445c841f40e793e733956ab65287ca5cfe1 (patch) | |
| tree | f54b733b0a6a3353cb595d6c4664689ea5bf8a3f /Mailman/Handlers/CookHeaders.py | |
| parent | 7bee928877b9771072c32c47912b346b41ce3c35 (diff) | |
| parent | 8f22ba21a32701d2efaac0b8b1a1c0a4522912b0 (diff) | |
| download | mailman2-3d3ed445c841f40e793e733956ab65287ca5cfe1.tar.gz mailman2-3d3ed445c841f40e793e733956ab65287ca5cfe1.tar.xz mailman2-3d3ed445c841f40e793e733956ab65287ca5cfe1.zip | |
Update to lp:mailman/2.1 rev 1629 (no difference against the original branch
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: |