Index: openacs-4/packages/general-comments/www/comment-ae-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-ae-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/general-comments/www/comment-ae-2.adp	20 Apr 2001 20:51:11 -0000	1.1
+++ openacs-4/packages/general-comments/www/comment-ae-2.adp	31 Oct 2001 20:42:07 -0000	1.2
@@ -4,30 +4,25 @@
 
 Here is how your comment would appear:
 
-<if @mime_type@ eq text/html>
-  <blockquote>
-  <h4>@title@</h4>
-  @content@
-  </blockquote>
+<blockquote>
+<h4>@title@</h4>
+@html_content@
+</blockquote>
 
+<if @mime_type@ eq text/html>
   Note: if the text above has lost all of its paragraph breaks then you
   probably should have selected "Plain Text" rather than HTML.  Use
   your browser's Back button to return to the submission form.
 </if>
 <else>
-  <blockquote>
-  <h4>@title@</h4>
-  <%= [util_convert_plaintext_to_html $content] %>
-  </blockquote>
-
   Note: if the text above has a bunch of visible HTML tags then you probably
   should have selected "HTML" rather than "Plain Text".  Use your
   browser's Back button to return to the submission form.
 </else>
 
 <center>
 <form action="@target@" method=post>
-<%= [export_form_vars comment_id object_id object_name context_id title content mime_type category return_url] %>
+<%= [export_form_vars comment_id object_id object_name context_id title content comment_mime_type category return_url] %>
 <input type=submit name=submit value="Confirm">
 </form>
 </center>