diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 01:12:12 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 01:12:12 -0500 |
| commit | 38f1b73179154c1fef676021acd6362e88837a89 (patch) | |
| tree | 14b7789ccb23a7d0715dc9cfc75d3de0d3700dcf /packages/templatetags | |
| parent | aa2836cb3859e05e9524def5ec37706e3299205c (diff) | |
| parent | 03a0d27971898592698dbb0c5948b93c6a3a4741 (diff) | |
Merge tag 'release_2012-02-18'
Defend against bogus URLs, mirrorlist no FTP by default
Conflicts:
templates/public/index.html
Diffstat (limited to 'packages/templatetags')
| -rw-r--r-- | packages/templatetags/package_extras.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py index 71ff5ed8..2e68ef0c 100644 --- a/packages/templatetags/package_extras.py +++ b/packages/templatetags/package_extras.py @@ -9,8 +9,11 @@ from django.utils.html import escape register = template.Library() -def link_encode(url, query, doseq=False): - data = urlencode(query, doseq).replace('&', '&') +def link_encode(url, query): + # massage the data into all utf-8 encoded strings first, so urlencode + # doesn't barf at the data we pass it + query = dict((k, unicode(v).encode('utf-8')) for k, v in query.items()) + data = urlencode(query).replace('&', '&') return "%s?%s" % (url, data) @register.filter |