Author: adrian
Date: 2008-09-10 00:14:59 -0500 (Wed, 10 Sep 2008)
New Revision: 9000
Modified:
django/trunk/django/contrib/comments/templates/comments/approve.html
django/trunk/django/contrib/comments/templates/comments/delete.html
django/trunk/django/contrib/comments/templates/comments/flag.html
django/trunk/django/contrib/comments/templates/comments/moderation_queue.html
django/trunk/django/contrib/comments/templates/comments/preview.html
django/trunk/django/contrib/comments/templates/comments/reply_preview.html
Log:
Fixed #8959 -- Removed redundant calls to the 'escape' template filter in the
django.contrib.comments templates. Thanks, zgoda
Modified: django/trunk/django/contrib/comments/templates/comments/approve.html
===================================================================
--- django/trunk/django/contrib/comments/templates/comments/approve.html
2008-09-10 05:04:24 UTC (rev 8999)
+++ django/trunk/django/contrib/comments/templates/comments/approve.html
2008-09-10 05:14:59 UTC (rev 9000)
@@ -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 %}
\ No newline at end of file
+{% endblock %}
Modified: django/trunk/django/contrib/comments/templates/comments/delete.html
===================================================================
--- django/trunk/django/contrib/comments/templates/comments/delete.html
2008-09-10 05:04:24 UTC (rev 8999)
+++ django/trunk/django/contrib/comments/templates/comments/delete.html
2008-09-10 05:14:59 UTC (rev 9000)
@@ -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 %}
\ No newline at end of file
+{% endblock %}
Modified: django/trunk/django/contrib/comments/templates/comments/flag.html
===================================================================
--- django/trunk/django/contrib/comments/templates/comments/flag.html
2008-09-10 05:04:24 UTC (rev 8999)
+++ django/trunk/django/contrib/comments/templates/comments/flag.html
2008-09-10 05:14:59 UTC (rev 9000)
@@ -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 %}
\ No newline at end of file
+{% endblock %}
Modified:
django/trunk/django/contrib/comments/templates/comments/moderation_queue.html
===================================================================
---
django/trunk/django/contrib/comments/templates/comments/moderation_queue.html
2008-09-10 05:04:24 UTC (rev 8999)
+++
django/trunk/django/contrib/comments/templates/comments/moderation_queue.html
2008-09-10 05:14:59 UTC (rev 9000)
@@ -53,17 +53,17 @@
<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 %}
Modified: django/trunk/django/contrib/comments/templates/comments/preview.html
===================================================================
--- django/trunk/django/contrib/comments/templates/comments/preview.html
2008-09-10 05:04:24 UTC (rev 8999)
+++ django/trunk/django/contrib/comments/templates/comments/preview.html
2008-09-10 05:14:59 UTC (rev 9000)
@@ -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 %}
\ No newline at end of file
+{% endblock %}
Modified:
django/trunk/django/contrib/comments/templates/comments/reply_preview.html
===================================================================
--- django/trunk/django/contrib/comments/templates/comments/reply_preview.html
2008-09-10 05:04:24 UTC (rev 8999)
+++ django/trunk/django/contrib/comments/templates/comments/reply_preview.html
2008-09-10 05:14:59 UTC (rev 9000)
@@ -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>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
