Index: openacs-4/packages/forums/lib/message/post.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/post.tcl,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/forums/lib/message/post.tcl	26 Apr 2004 17:53:23 -0000	1.3.2.1
+++ openacs-4/packages/forums/lib/message/post.tcl	22 Jun 2004 16:53:41 -0000	1.3.2.2
@@ -43,6 +43,10 @@
     -datatype text \
     -widget hidden
 
+if { [exists_and_not_null content] && [exists_and_not_null format] } {
+  element set_properties message message_body -value [list $content $format]
+}
+
 if {[form is_request message]} {
     ##############################
     # Form initialisation
@@ -77,8 +81,7 @@
         forum_id \
         parent_id \
         subject \
-        content \
-        html_p \
+        message_body \
         confirm_p \
         subscribe_p \
         anonymous_p \
@@ -96,10 +99,11 @@
         set confirm_p 1
         set subject.spellcheck ":nospell:"
         set content.spellcheck ":nospell:"
-        set content [string trimright $content]
-        set exported_vars [export_form_vars message_id forum_id parent_id subject content html_p confirm_p subject.spellcheck content.spellcheck anonymous_p attach_p]
+        set content [string trimright [template::util::richtext::get_property contents $message_body]]
+        set format [string trimright [template::util::richtext::get_property format $message_body]]
+        set exported_vars [export_vars -form {message_id forum_id parent_id subject {message_body $content} {message_body.format $format} confirm_p subject.spellcheck content.spellcheck anonymous_p attach_p}]
         
-        set message(html_p) $html_p
+        set message(format) $format
         set message(subject) $subject
         set message(content) $content
         set message(user_id) $displayed_user_id
@@ -125,13 +129,15 @@
     }
 
     if { [string equal $action "post"] } {
+      set content [string trimright [template::util::richtext::get_property contents $message_body]]
+      set format [string trimright [template::util::richtext::get_property format $message_body]]
       forum::message::new \
           -forum_id $forum_id \
           -message_id $message_id \
           -parent_id $parent_id \
           -subject $subject \
           -content $content \
-          -html_p $html_p \
+          -format $format \
           -user_id $displayed_user_id
 
       if {[empty_string_p $parent_id]} {