diff options
| author | bwarsaw | 1999-11-12 21:06:22 +0000 |
|---|---|---|
| committer | bwarsaw | 1999-11-12 21:06:22 +0000 |
| commit | 48aa1953c058d13b1e004362598c2a3979c5bfd5 (patch) | |
| tree | e757788f32bfb8f973742484f453fd82dad840e0 | |
| parent | 582a260956198aa0aef3e182d6eae24b5ef41d1d (diff) | |
| download | mailman-48aa1953c058d13b1e004362598c2a3979c5bfd5.tar.gz mailman-48aa1953c058d13b1e004362598c2a3979c5bfd5.tar.zst mailman-48aa1953c058d13b1e004362598c2a3979c5bfd5.zip | |
When adding the header and the footer, be sure to convert \r\n to just
\n so we don't see ^M's in this text (some MTAs may do the conversion
anyway, but not all)
| -rw-r--r-- | Mailman/Handlers/Decorate.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Mailman/Handlers/Decorate.py b/Mailman/Handlers/Decorate.py index 107098453..76fd37de9 100644 --- a/Mailman/Handlers/Decorate.py +++ b/Mailman/Handlers/Decorate.py @@ -19,6 +19,7 @@ from Mailman import mm_cfg from Mailman import Utils +import string @@ -26,6 +27,6 @@ def process(mlist, msg): d = Utils.SafeDict(mlist.__dict__) d['cgiext'] = mm_cfg.CGIEXT # interpolate into the header - header = mlist.msg_header % d - footer = mlist.msg_footer % d + header = string.replace(mlist.msg_header % d, '\r\n', '\n') + footer = string.replace(mlist.msg_footer % d, '\r\n', '\n') msg.body = header + msg.body + footer |