From 5cc93500e88794342adcc738fd4d7bb6f40330c6 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Wed, 10 Sep 2008 05:14:59 +0000
Subject: [PATCH] Fixed #8959 -- Removed redundant calls to the 'escape'
 template filter in the django.contrib.comments templates. Thanks, zgoda

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 .../contrib/comments/templates/comments/approve.html   |  6 +++---
 django/contrib/comments/templates/comments/delete.html |  6 +++---
 django/contrib/comments/templates/comments/flag.html   |  6 +++---
 .../comments/templates/comments/moderation_queue.html  | 10 +++++-----
 .../contrib/comments/templates/comments/preview.html   |  4 ++--
 .../comments/templates/comments/reply_preview.html     |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/django/contrib/comments/templates/comments/approve.html b/django/contrib/comments/templates/comments/approve.html
index 18157b77f9..1f1d1f4090 100644
--- a/django/contrib/comments/templates/comments/approve.html
+++ b/django/contrib/comments/templates/comments/approve.html
@@ -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 %}
diff --git a/django/contrib/comments/templates/comments/delete.html b/django/contrib/comments/templates/comments/delete.html
index 6486951a07..eb5406eee5 100644
--- a/django/contrib/comments/templates/comments/delete.html
+++ b/django/contrib/comments/templates/comments/delete.html
@@ -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 %}
diff --git a/django/contrib/comments/templates/comments/flag.html b/django/contrib/comments/templates/comments/flag.html
index b6090e63c3..2a65ab379c 100644
--- a/django/contrib/comments/templates/comments/flag.html
+++ b/django/contrib/comments/templates/comments/flag.html
@@ -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 %}
diff --git a/django/contrib/comments/templates/comments/moderation_queue.html b/django/contrib/comments/templates/comments/moderation_queue.html
index b5519dfab1..2a45757e6e 100644
--- a/django/contrib/comments/templates/comments/moderation_queue.html
+++ b/django/contrib/comments/templates/comments/moderation_queue.html
@@ -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 %}
diff --git a/django/contrib/comments/templates/comments/preview.html b/django/contrib/comments/templates/comments/preview.html
index 50ed6d6fce..fd2571335a 100644
--- a/django/contrib/comments/templates/comments/preview.html
+++ b/django/contrib/comments/templates/comments/preview.html
@@ -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 %}
diff --git a/django/contrib/comments/templates/comments/reply_preview.html b/django/contrib/comments/templates/comments/reply_preview.html
index b566110bcb..fd2571335a 100644
--- a/django/contrib/comments/templates/comments/reply_preview.html
+++ b/django/contrib/comments/templates/comments/reply_preview.html
@@ -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>