Index: openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql	5 Aug 2002 20:00:09 -0000	1.7
+++ openacs-4/packages/forums/sql/postgresql/forums-messages-package-create.sql	20 Aug 2002 21:39:42 -0000	1.8
@@ -182,25 +182,25 @@
     where message_id = p_message_id;
            
     -- if it is already deleted
-    if NOTFOUND
+    if v_forum_id is null
     then return 0;
     end if;
 
     -- delete all children
     -- order by tree_sortkey desc to guarantee
     -- that we never delete a parent before its child
     -- sortkeys are beautiful
-    for v_message in (select *
-                      from forums_messages
-                      where forum_id = v_forum_id
-                      and tree_sortkey between tree_left(v_sortkey) and tree_right(v_sortkey)
-                      order by tree_sortkey desc)
+    for v_message in select *
+                     from forums_messages
+                     where forum_id = v_forum_id
+                     and tree_sortkey between tree_left(v_sortkey) and tree_right(v_sortkey)
+                     order by tree_sortkey desc
     loop
         perform forums_message__delete(v_message.message_id);
     end loop;
 
     -- delete the message itself
-    perform forums_message.delete(p_message_id);
+    perform forums_message__delete(p_message_id);
 
     return 0;
 end;
Index: openacs-4/packages/forums/tcl/messages-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/Attic/messages-procs-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/tcl/messages-procs-postgresql.xql	2 Jul 2002 19:42:19 -0000	1.4
+++ openacs-4/packages/forums/tcl/messages-procs-postgresql.xql	20 Aug 2002 21:39:42 -0000	1.5
@@ -48,25 +48,19 @@
 
     <fullquery name="forum::message::delete.delete_message">
         <querytext>
-            declare begin
-                forums_message__delete_thread(:message_id);
-            end;
+            select forums_message__delete_thread(:message_id);
         </querytext>
     </fullquery>
 
     <fullquery name="forum::message::close.thread_close">
         <querytext>
-            declare begin
-                forums_message__thread_close(:message_id);
-            end;
+            select forums_message__thread_close(:message_id);
         </querytext>
     </fullquery>
 
     <fullquery name="forum::message::open.thread_open">
         <querytext>
-            declare begin
-                forums_message__thread_open(:message_id);
-            end;
+            select forums_message__thread_open(:message_id);
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/forums/tcl/messages-procs.tcl	25 Jul 2002 19:54:31 -0000	1.9
+++ openacs-4/packages/forums/tcl/messages-procs.tcl	20 Aug 2002 21:39:42 -0000	1.10
@@ -18,7 +18,6 @@
         {-content:required}
         {-html_p "f"}
         {-user_id ""}
-	{-posting_date ""}
     } {
         create a new message
     } {
@@ -30,7 +29,7 @@
 
         # Prepare the variables for instantiation
         set extra_vars [ns_set create]
-        oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {forum_id message_id parent_id subject content html_p user_id posting_date}
+        oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {forum_id message_id parent_id subject content html_p user_id}
 
         db_transaction {
             set message_id [package_instantiate_object -extra_vars $extra_vars forums_message]
Index: openacs-4/packages/forums/www/moderate/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/moderate/message-delete.adp	29 May 2002 21:40:11 -0000	1.1
+++ openacs-4/packages/forums/www/moderate/message-delete.adp	20 Aug 2002 21:39:42 -0000	1.2
@@ -2,19 +2,20 @@
 <property name="title">Confirm Delete: @message.subject@</property>
 <property name="context_bar"></property>
 
-Are you sure you want to delete this message?
-<p>
-<b>@message.subject@</b>
+<table width="95%">
+  
+  Are you sure you want to delete this message and <strong>all replies to it</strong>?
+  <p>
+  
+  <table style="color: black; background-color: @table_border_color@;" width="100%">
+    <include src="../message-chunk" &message="message" preview=1>
+  </table>
+  
+  <p>
+  
+  <a href="message-delete?@url_vars@&confirm_p=1">Yes</a>
+  <p>
+  <a href="@return_url@?message_id=@message_id@">No</a>
+  <p>
 
-<p>
-
-<blockquote>
-@message.content@
-</blockquote>
-
-<p>
-
-<a href="message-delete?@url_vars@&confirm_p=1">Yes</a>
-<p>
-<a href="@return_url@?message_id=@message_id@">No</a>
-<p>
+</table>
Index: openacs-4/packages/forums/www/moderate/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/moderate/message-delete.tcl	3 Jun 2002 04:39:06 -0000	1.2
+++ openacs-4/packages/forums/www/moderate/message-delete.tcl	20 Aug 2002 21:39:42 -0000	1.3
@@ -12,6 +12,8 @@
     {confirm_p 0}
 }
 
+set table_border_color [parameter::get -parameter table_border_color]
+
 # Check that the user can moderate the forum
 forum::security::require_moderate_message -message_id $message_id