Django

Code

Changeset 7810

Show
Ignore:
Timestamp:
06/30/08 12:38:13 (5 months ago)
Author:
brosner
Message:

newforms-admin: Fixed #4074 -- Properly urlencode the ChangeList? query string when the value has an ampersand. Thanks Tony Perkins and SmileyChris?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/contrib/admin/views/main.py

    r7736 r7810  
    77from django.utils.translation import ugettext 
    88from django.utils.safestring import mark_safe 
     9from django.utils.http import urlencode 
    910import operator 
    1011 
    …… 
    101102                    del p[k] 
    102103        for k, v in new_params.items(): 
    103             if k in p and v is None: 
    104                 del p[k] 
    105             elif v is not None: 
     104            if v is None: 
     105                if k in p: 
     106                    del p[k] 
     107            else: 
    106108                p[k] = v 
    107         return mark_safe('?' + '&'.join([u'%s=%s' % (k, v) for k, v in p.items()]).replace(' ', '%20')) 
     109        return '?%s' % urlencode(p) 
    108110 
    109111    def get_results(self, request):