Commit 8938d5ee authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

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
parent 7bd31115

django/contrib/admin/templates/admin/base.html

+1 −1
Original line number Diff line number Diff line
@@ -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>