Merge branch 'master' into version-3.0

ddc17773 · Tom Christie · 1ef4e6b7 · b5c98f68 · ddc17773
Commit ddc17773 authored Nov 03, 2014 by Tom Christie
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

rest_framework/templatetags/rest_framework.py
+1 -1

No files found.
--- a/rest_framework/templatetags/rest_framework.py
+++ b/rest_framework/templatetags/rest_framework.py
@@ -23,7 +23,7 @@ def replace_query_param(url, key, val):
    query_dict = QueryDict(query).copy()
    query_dict[key] = val
    query = query_dict.urlencode()
-    return urlparse.urlunsplit((scheme, netloc, path, query, fragment))
+    return escape(urlparse.urlunsplit((scheme, netloc, path, query, fragment)))


 # Regex for adding classes to html snippets