summaryrefslogtreecommitdiff
path: root/django/contrib/admin/templates
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-06-14 14:56:19 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-06-14 14:56:19 +0000
commit8938d5eeb32bd246aacab22ddbd0484165de7a94 (patch)
treee5406dd8681f3e171ae10d669779f75954e5cbe4 /django/contrib/admin/templates
parent7bd31115f87d6b4f69407b3cc70054a71295f131 (diff)
Fixed #2152 -- Now HTML-escaping user.first_name in admin/base.html template
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/admin/templates')
-rw-r--r--django/contrib/admin/templates/admin/base.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html
index b1e9d5d1be..e7f1c7e5a9 100644
--- a/django/contrib/admin/templates/admin/base.html
+++ b/django/contrib/admin/templates/admin/base.html
@@ -21,7 +21,7 @@
{% block branding %}{% endblock %}
</div>
{% if not user.is_anonymous %}{% if user.is_staff %}
- <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="doc/">{% trans 'Documentation' %}</a> / <a href="password_change/">{% trans 'Change password' %}</a> / <a href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
+ <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="doc/">{% trans 'Documentation' %}</a> / <a href="password_change/">{% trans 'Change password' %}</a> / <a href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
{% endif %}{% endif %}
{% block nav-global %}{% endblock %}
</div>