diff options
Diffstat (limited to 'Mailman/Archiver/HyperArch.py')
| -rw-r--r-- | Mailman/Archiver/HyperArch.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py index 6f66db4a..3fc5fadf 100644 --- a/Mailman/Archiver/HyperArch.py +++ b/Mailman/Archiver/HyperArch.py @@ -303,7 +303,12 @@ class Article(pipermail.Article): if charset[0]=="'" and charset[-1]=="'": charset = charset[1:-1] try: - body = message.get_payload(decode=True) + # Check Scrubber-munged payload + if message.get('x-mailman-scrubbed'): + decode = False + else: + decode = True + body = message.get_payload(decode=decode) except binascii.Error: body = None if body and charset != Utils.GetCharSet(self._lang): |