django
diff --git a/Collapse file: django/contrib/admin/filterspecs.py
‎django/contrib/admin/filterspecs.py‎
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions b/Collapse file: django/contrib/admin/filterspecs.py
‎django/contrib/admin/filterspecs.py‎
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/Collapse file: django/contrib/admin/models.py
‎django/contrib/admin/models.py‎
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/Collapse file: django/contrib/admin/models.py
‎django/contrib/admin/models.py‎
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/Collapse file: django/contrib/admin/templates/admin/base_site.html
‎django/contrib/admin/templates/admin/base_site.html‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file: django/contrib/admin/templates/admin/base_site.html
‎django/contrib/admin/templates/admin/base_site.html‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file: django/contrib/admin/templates/admin/change_form.html
‎django/contrib/admin/templates/admin/change_form.html‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file: django/contrib/admin/templates/admin/change_form.html
‎django/contrib/admin/templates/admin/change_form.html‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file: django/contrib/admin/templates/admin/date_hierarchy.html
‎django/contrib/admin/templates/admin/date_hierarchy.html‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file: django/contrib/admin/templates/admin/date_hierarchy.html
‎django/contrib/admin/templates/admin/date_hierarchy.html‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file: django/contrib/admin/templates/admin/delete_confirmation.html
‎django/contrib/admin/templates/admin/delete_confirmation.html‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file: django/contrib/admin/templates/admin/delete_confirmation.html
‎django/contrib/admin/templates/admin/delete_confirmation.html‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file: django/contrib/admin/templates/admin/edit_inline_stacked.html
‎django/contrib/admin/templates/admin/edit_inline_stacked.html‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file: django/contrib/admin/templates/admin/edit_inline_stacked.html
‎django/contrib/admin/templates/admin/edit_inline_stacked.html‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file: django/contrib/admin/templates/admin/edit_inline_tabular.html
‎django/contrib/admin/templates/admin/edit_inline_tabular.html‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file: django/contrib/admin/templates/admin/edit_inline_tabular.html
‎django/contrib/admin/templates/admin/edit_inline_tabular.html‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file: django/contrib/admin/templates/admin/index.html
‎django/contrib/admin/templates/admin/index.html‎
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/Collapse file: django/contrib/admin/templates/admin/index.html
‎django/contrib/admin/templates/admin/index.html‎
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/Collapse file: django/contrib/admin/templates/admin/invalid_setup.html
‎django/contrib/admin/templates/admin/invalid_setup.html‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file: django/contrib/admin/templates/admin/invalid_setup.html
‎django/contrib/admin/templates/admin/invalid_setup.html‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
@@ -9,6 +9,8 @@
 from django.db import models
 from django.utils.encoding import smart_unicode, iri_to_uri
 from django.utils.translation import ugettext as _
+from django.utils.html import escape
+from django.utils.safestring import mark_safe
 import datetime
 
 class FilterSpec(object):
@@ -39,15 +41,15 @@ def title(self):
     def output(self, cl):
         t = []
         if self.has_output():
-            t.append(_(u'<h3>By %s:</h3>\n<ul>\n') % self.title())
+            t.append(_(u'<h3>By %s:</h3>\n<ul>\n') % escape(self.title()))
 
             for choice in self.choices(cl):
                 t.append(u'<li%s><a href="%s">%s</a></li>\n' % \
                     ((choice['selected'] and ' class="selected"' or ''),
                      iri_to_uri(choice['query_string']),
                      choice['display']))
             t.append('</ul>\n\n')
-        return "".join(t)
+        return mark_safe("".join(t))
 
 class RelatedFilterSpec(FilterSpec):
     def __init__(self, f, request, params, model):
 
@@ -3,6 +3,7 @@
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_unicode
+from django.utils.safestring import mark_safe
 
 ADDITION = 1
 CHANGE = 2
@@ -49,4 +50,4 @@ def get_admin_url(self):
         Returns the admin URL to edit the object represented by this log entry.
         This is relative to the Django admin index page.
         """
-        return u"%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, self.object_id)
+        return mark_safe(u"%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, self.object_id))
@@ -1,7 +1,7 @@
 {% extends "admin/base.html" %}
 {% load i18n %}
 
-{% block title %}{{ title|escape }} | {% trans 'Django site admin' %}{% endblock %}
+{% block title %}{{ title }} | {% trans 'Django site admin' %}{% endblock %}
 
 {% block branding %}
 <h1 id="site-name">{% trans 'Django administration' %}</h1>
 
@@ -10,8 +10,8 @@
 {% block breadcrumbs %}{% if not is_popup %}
 <div class="breadcrumbs">
      <a href="../../../">{% trans "Home" %}</a> &rsaquo;
-     <a href="../">{{ opts.verbose_name_plural|capfirst|escape }}</a> &rsaquo;
-     {% if add %}{% trans "Add" %} {{ opts.verbose_name|escape }}{% else %}{{ original|truncatewords:"18"|escape }}{% endif %}
+     <a href="../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
+     {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
 </div>
 {% endif %}{% endblock %}
 {% block content %}<div id="content-main">
 
@@ -1,9 +1,9 @@
 {% if show %}
 <div class="xfull">
 <ul class="toplinks">
-{% if back %}<li class="date-back"><a href="{{ back.link }}">&lsaquo; {{ back.title|escape }}</a></li>{% endif %}
+{% if back %}<li class="date-back"><a href="{{ back.link }}">&lsaquo; {{ back.title }}</a></li>{% endif %}
 {% for choice in choices %}
-<li> {% if choice.link %}<a href="{{ choice.link }}">{% endif %}{{ choice.title|escape }}{% if choice.link %}</a>{% endif %}</li>
+<li> {% if choice.link %}<a href="{{ choice.link }}">{% endif %}{{ choice.title }}{% if choice.link %}</a>{% endif %}</li>
 {% endfor %}
 </ul><br class="clear" />
 </div>
 
@@ -3,7 +3,7 @@
 {% block breadcrumbs %}
 <div class="breadcrumbs">
      <a href="../../../../">{% trans "Home" %}</a> &rsaquo;
-     <a href="../../">{{ opts.verbose_name_plural|capfirst|escape }}</a> &rsaquo;
+     <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
      <a href="../">{{ object|escape|truncatewords:"18" }}</a> &rsaquo;
      {% trans 'Delete' %}
 </div>
@@ -13,7 +13,7 @@
     <p>{% blocktrans with object|escape as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p>
     <ul>
     {% for obj in perms_lacking %}
-        <li>{{ obj|escape }}</li>
+        <li>{{ obj }}</li>
     {% endfor %}
     </ul>
 {% else %}
 
@@ -1,7 +1,7 @@
 {% load admin_modify %}
 <fieldset class="module aligned">
    {% for fcw in bound_related_object.form_field_collection_wrappers %}
-      <h2>{{ bound_related_object.relation.opts.verbose_name|capfirst|escape }}&nbsp;#{{ forloop.counter }}</h2>
+      <h2>{{ bound_related_object.relation.opts.verbose_name|capfirst }}&nbsp;#{{ forloop.counter }}</h2>
       {% if bound_related_object.show_url %}{% if fcw.obj.original %}
       <p><a href="/r/{{ fcw.obj.original.content_type_id }}/{{ fcw.obj.original.id }}/">View on site</a></p>
       {% endif %}{% endif %}
 
@@ -1,10 +1,10 @@
 {% load admin_modify %}
 <fieldset class="module">
-   <h2>{{ bound_related_object.relation.opts.verbose_name_plural|capfirst|escape }}</h2><table>
+   <h2>{{ bound_related_object.relation.opts.verbose_name_plural|capfirst }}</h2><table>
    <thead><tr>
    {% for fw in bound_related_object.field_wrapper_list %}
       {% if fw.needs_header %}
-         <th{{ fw.header_class_attribute }}>{{ fw.field.verbose_name|capfirst|escape }}</th>
+         <th{{ fw.header_class_attribute }}>{{ fw.field.verbose_name|capfirst }}</th>
       {% endif %}
    {% endfor %}
    </tr></thead>
 
@@ -19,9 +19,9 @@
         {% for model in app.models %}
             <tr>
             {% if model.perms.change %}
-                <th scope="row"><a href="{{ model.admin_url }}">{{ model.name|escape }}</a></th>
+                <th scope="row"><a href="{{ model.admin_url }}">{{ model.name }}</a></th>
             {% else %}
-                <th scope="row">{{ model.name|escape }}</th>
+                <th scope="row">{{ model.name }}</th>
             {% endif %}
 
             {% if model.perms.add %}
@@ -58,7 +58,7 @@ <h3>{% trans 'My Actions' %}</h3>
             {% else %}
             <ul class="actionlist">
             {% for entry in admin_log %}
-            <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">{% if not entry.is_deletion %}<a href="{{ entry.get_admin_url }}">{% endif %}{{ entry.object_repr|escape }}{% if not entry.is_deletion %}</a>{% endif %}<br /><span class="mini quiet">{% filter capfirst|escape %}{% trans entry.content_type.name %}{% endfilter %}</span></li>
+            <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">{% if not entry.is_deletion %}<a href="{{ entry.get_admin_url }}">{% endif %}{{ entry.object_repr|escape }}{% if not entry.is_deletion %}</a>{% endif %}<br /><span class="mini quiet">{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span></li>
             {% endfor %}
             </ul>
             {% endif %}
 
@@ -1,7 +1,7 @@
 {% extends "admin/base_site.html" %}
 {% load i18n %}
 
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> &rsaquo; {{ title|escape }}</div>{% endblock %}
+{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> &rsaquo; {{ title }}</div>{% endblock %}
 
 {% block content %}