Merge branch 'master' into version-3.0

This commit is contained in:
Tom Christie 2014-11-03 11:10:47 +00:00
commit ddc177732c

View File

@ -23,7 +23,7 @@ def replace_query_param(url, key, val):
query_dict = QueryDict(query).copy() query_dict = QueryDict(query).copy()
query_dict[key] = val query_dict[key] = val
query = query_dict.urlencode() 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 # Regex for adding classes to html snippets