aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-11-03 11:10:47 +0000
committerTom Christie2014-11-03 11:10:47 +0000
commitddc177732c94ee442234cb0d58093bcf5e941403 (patch)
tree278ac165f849df33e6dafbf9df1a4f79aacaf8ce
parent1ef4e6b7a84f358ca1509552f535eb0c65e69aee (diff)
parentb5c98f686d8aa8f249aa0270f8ee0560482d9538 (diff)
downloaddjango-rest-framework-ddc177732c94ee442234cb0d58093bcf5e941403.tar.bz2
Merge branch 'master' into version-3.0
-rw-r--r--rest_framework/templatetags/rest_framework.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py
index d9424f02..7251f071 100644
--- 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