aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2016-09-29 12:10:08 -0700
committerMark Sapiro <mark@msapiro.net>2016-09-29 12:10:08 -0700
commitf436fcb0c2e73fcc0e52b609f8464999759ac261 (patch)
treec176ebc26d99e34b314610f3fec89b776dc9beb0
parent8ac8b67ac7c561efa0c155ff812c939082cfd6f2 (diff)
downloadmailman2-f436fcb0c2e73fcc0e52b609f8464999759ac261.tar.gz
mailman2-f436fcb0c2e73fcc0e52b609f8464999759ac261.tar.xz
mailman2-f436fcb0c2e73fcc0e52b609f8464999759ac261.zip
Fix unicode links in multi-page admin Membership list search results.
-rw-r--r--Mailman/Cgi/admin.py7
-rw-r--r--NEWS3
2 files changed, 8 insertions, 2 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index 41dc5cf1..843f6e08 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -1188,8 +1188,11 @@ def membership_options(mlist, subcat, cgidata, doc, form):
continue
start = chunkmembers[i*chunksz]
end = chunkmembers[min((i+1)*chunksz, last)-1]
- link = Link(url + 'chunk=%d' % i + findfrag,
- _('from %(start)s to %(end)s'))
+ url = url + 'chunk=%d' % i + findfrag
+ if isinstance(url, unicode):
+ url = url.encode(Utils.GetCharSet(mlist.preferred_language),
+ errors='ignore')
+ link = Link(url, _('from %(start)s to %(end)s'))
buttons.append(link)
buttons = UnorderedList(*buttons)
container.AddItem(footer + buttons.Format() + '<p>')
diff --git a/NEWS b/NEWS
index 851db4c7..bc650ceb 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - The 2.1.23 fix for LP: #1604544 only fixed the letter links at the top
+ of the Membership List. The links at the bottom have now been fixed.
+
- paths.py now adds dist-packages as well as site-packages to sys.path.
(LP: #1621172)