Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

format_html was missing in optional_logout template-tag #3556

Merged
merged 6 commits into from
Oct 28, 2015
Merged

format_html was missing in optional_logout template-tag #3556

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8348008
Merge pull request #1 from tomchristie/master
rense Mar 2, 2015
b172ed0
Update from upstream
Mar 9, 2015
5b7404c
Merge remote-tracking branch 'upstream/master'
rense Apr 18, 2015
c774a4c
Merge branch 'master' of https://github.com/rense/django-rest-framework
rense Oct 10, 2015
6aef157
Merge remote-tracking branch 'tomchristie/master'
rense Oct 28, 2015
0d568ed
format_html was missing in optional_logout template-tag
rense Oct 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion rest_framework/templatetags/rest_framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ def optional_logout(request, user):
try:
logout_url = reverse('rest_framework:logout')
except NoReverseMatch:
return '<li class="navbar-text">{user}</li>'.format(user=user)
snippet = format_html('<li class="navbar-text">{user}</li>', user=escape(user))
return mark_safe(snippet)

snippet = """<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
Expand Down