diff options
| author | Mark Sapiro <mark@msapiro.net> | 2019-11-08 13:51:55 -0800 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2019-11-08 13:51:55 -0800 |
| commit | 74f050981cd4dca57451ea74a1ec4a8b3dba153f (patch) | |
| tree | 4334aed7acd8001fd82c07104de97640640f1460 /Mailman/MailList.py | |
| parent | b50d34f55aed1164272cced668a83e7fa6f6233a (diff) | |
| download | mailman2-74f050981cd4dca57451ea74a1ec4a8b3dba153f.tar.gz mailman2-74f050981cd4dca57451ea74a1ec4a8b3dba153f.tar.xz mailman2-74f050981cd4dca57451ea74a1ec4a8b3dba153f.zip | |
Fix possible UnicodeDecodeError in sending subscription confirmation.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/MailList.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index b85b1427..12d75aff 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -969,8 +969,9 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, cookie = self.pend_new(Pending.SUBSCRIPTION, userdesc) # Send the user the confirmation mailback if remote is None: - by = remote = '' + oremote = by = remote = '' else: + oremote = remote by = ' ' + remote remote = _(' from %(remote)s') @@ -997,7 +998,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, msg['Reply-To'] = self.GetRequestEmail(cookie) # Is this confirmation a reply to an email subscribe from this # address? - if remote.lower().endswith(email.lower()): + if oremote.lower().endswith(email.lower()): autosub = 'auto-replied' else: autosub = 'auto-generated' |