Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #8959 -- Removed redundant calls to the 'escape' template filte…

…r in the django.contrib.comments templates. Thanks, zgoda

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 5cc93500e88794342adcc738fd4d7bb6f40330c6 1 parent 665f934
Adrian Holovaty adrianholovaty authored
6 django/contrib/comments/templates/comments/approve.html
View
@@ -4,11 +4,11 @@
{% block content %}
<h1>Really make this comment public?</h1>
- <blockquote>{{ comment|escape|linebreaks }}</blockquote>
+ <blockquote>{{ comment|linebreaks }}</blockquote>
<form action="." method="POST">
- <input type="hidden" name="next" value="{{ next|escape }}" id="next">
+ <input type="hidden" name="next" value="{{ next }}" id="next">
<p class="submit">
<input type="submit" name="submit" value="Approve"> or <a href="{{ comment.permalink }}">cancel</a>
</p>
</form>
-{% endblock %}
+{% endblock %}
6 django/contrib/comments/templates/comments/delete.html
View
@@ -4,11 +4,11 @@
{% block content %}
<h1>Really remove this comment?</h1>
- <blockquote>{{ comment|escape|linebreaks }}</blockquote>
+ <blockquote>{{ comment|linebreaks }}</blockquote>
<form action="." method="POST">
- <input type="hidden" name="next" value="{{ next|escape }}" id="next">
+ <input type="hidden" name="next" value="{{ next }}" id="next">
<p class="submit">
<input type="submit" name="submit" value="Remove"> or <a href="{{ comment.permalink }}">cancel</a>
</p>
</form>
-{% endblock %}
+{% endblock %}
6 django/contrib/comments/templates/comments/flag.html
View
@@ -4,11 +4,11 @@
{% block content %}
<h1>Really flag this comment?</h1>
- <blockquote>{{ comment|escape|linebreaks }}</blockquote>
+ <blockquote>{{ comment|linebreaks }}</blockquote>
<form action="." method="POST">
- <input type="hidden" name="next" value="{{ next|escape }}" id="next">
+ <input type="hidden" name="next" value="{{ next }}" id="next">
<p class="submit">
<input type="submit" name="submit" value="Flag"> or <a href="{{ comment.permalink }}">cancel</a>
</p>
</form>
-{% endblock %}
+{% endblock %}
10 django/contrib/comments/templates/comments/moderation_queue.html
View
@@ -53,17 +53,17 @@ <h1 id="site-name">Comment moderation queue</h1>
<input class="remove submit" type="submit" name="submit" value="Remove">
</form>
</td>
- <td>{{ comment.name|escape }}</td>
- <td>{{ comment.comment|truncatewords:"50"|escape }}</td>
- <td>{{ comment.email|escape }}</td>
- <td>{{ comment.url|escape }}</td>
+ <td>{{ comment.name }}</td>
+ <td>{{ comment.comment|truncatewords:"50" }}</td>
+ <td>{{ comment.email }}</td>
+ <td>{{ comment.url }}</td>
<td>
<img
src="{% admin_media_prefix %}img/admin/icon-{% if comment.user %}yes{% else %}no{% endif %}.gif"
alt="{% if comment.user %}yes{% else %}no{% endif %}"
/>
</td>
- <td>{{ comment.ip_address|escape }}</td>
+ <td>{{ comment.ip_address }}</td>
<td>{{ comment.submit_date|date:"F j, P" }}</td>
</tr>
{% endfor %}
4 django/contrib/comments/templates/comments/preview.html
View
@@ -9,7 +9,7 @@
<h1>Please correct the error{{ form.errors|pluralize }} below</h1>
{% else %}
<h1>Preview your comment</h1>
- <blockquote>{{ comment|escape|linebreaks }}</blockquote>
+ <blockquote>{{ comment|linebreaks }}</blockquote>
<p>
and <input type="submit" name="submit" value="Post your comment" id="submit"> or make changes:
</p>
@@ -31,4 +31,4 @@
<input type="submit" name="submit" class="submit-preview" value="Preview">
</p>
</form>
-{% endblock %}
+{% endblock %}
2  django/contrib/comments/templates/comments/reply_preview.html
View
@@ -9,7 +9,7 @@
<h1>Please correct the error{{ form.errors|pluralize }} below</h1>
{% else %}
<h1>Preview your comment</h1>
- <blockquote>{{ comment|escape|linebreaks }}</blockquote>
+ <blockquote>{{ comment|linebreaks }}</blockquote>
<p>
and <input type="submit" name="submit" value="Post your comment" id="submit"> or make changes:
</p>
Please sign in to comment.
Something went wrong with that request. Please try again.