From ea59344d725adc5c94a0ab2c1986c6a033329ad9 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Wed, 31 May 2006 15:10:01 +0000
Subject: [PATCH] Fixed #2006 -- Admin now quotes strings in breadcrumbs and
 filters. Thanks, mhf@hex.no

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/admin/templates/admin/change_form.html | 2 +-
 django/contrib/admin/templates/admin/filter.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html
index a667087f5f..fa04969f01 100644
--- a/django/contrib/admin/templates/admin/change_form.html
+++ b/django/contrib/admin/templates/admin/change_form.html
@@ -12,7 +12,7 @@
 <div class="breadcrumbs">
      <a href="../../../">{% trans "Home" %}</a> &rsaquo;
      <a href="../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
-     {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|striptags|truncatewords:"18" }}{% endif %}
+     {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18"|escape }}{% endif %}
 </div>
 {% endif %}{% endblock %}
 {% block content %}<div id="content-main">
diff --git a/django/contrib/admin/templates/admin/filter.html b/django/contrib/admin/templates/admin/filter.html
index f6f5455c01..5b0e78b6fc 100644
--- a/django/contrib/admin/templates/admin/filter.html
+++ b/django/contrib/admin/templates/admin/filter.html
@@ -3,6 +3,6 @@
 <ul>
 {% for choice in choices %}
     <li{% if choice.selected %} class="selected"{% endif %}>
-    <a href="{{ choice.query_string }}">{{ choice.display }}</a></li>
+    <a href="{{ choice.query_string }}">{{ choice.display|escape }}</a></li>
 {% endfor %}
 </ul>