diff options
| author | bwarsaw | 2002-09-19 03:37:47 +0000 |
|---|---|---|
| committer | bwarsaw | 2002-09-19 03:37:47 +0000 |
| commit | 3dbbfaecda3250fe73ceb5b2efd0e6f4a5679d66 (patch) | |
| tree | 271f0a18825dc04e7b15a17908733f5be39d053c /Mailman | |
| parent | b5ade3c020fba7ff9da848549eb570d76de4acf5 (diff) | |
| download | mailman-3dbbfaecda3250fe73ceb5b2efd0e6f4a5679d66.tar.gz mailman-3dbbfaecda3250fe73ceb5b2efd0e6f4a5679d66.tar.zst mailman-3dbbfaecda3250fe73ceb5b2efd0e6f4a5679d66.zip | |
subscription_prompt(), subscription_confirm(): Two more places where
we have to convert strings to or from unicode. Given by Tokio
Kikuchi, modified slightly by Barry (if it's still broken, it's my
mistake).
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Cgi/confirm.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py index 6a7d6be09..fbbf17087 100644 --- a/Mailman/Cgi/confirm.py +++ b/Mailman/Cgi/confirm.py @@ -196,10 +196,10 @@ def ask_for_cookie(mlist, doc, extra=''): def subscription_prompt(mlist, doc, cookie, userdesc): email = userdesc.address - name = userdesc.fullname password = userdesc.password digest = userdesc.digest lang = userdesc.language + name = Utils.uncanonstr(userdesc.fullname, lang) title = _('Confirm subscription request') doc.SetTitle(title) i18n.set_language(lang) @@ -311,8 +311,10 @@ def subscription_confirm(mlist, doc, cookie, cgidata): else: digest = None userdesc = Pending.confirm(cookie, expunge=0)[1] - overrides = UserDesc(fullname=cgidata.getvalue('realname', None), - digest=digest, lang=lang) + fullname = cgidata.getvalue('realname', None) + if fullname is not None: + fullname = Utils.canonstr(fullname) + overrides = UserDesc(fullname=fullname, digest=digest, lang=lang) userdesc += overrides op, addr, pw, digest, lang = mlist.ProcessConfirmation( cookie, userdesc) |