Index: openacs-4/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v
diff -u -r1.13.2.2 -r1.13.2.3
--- openacs-4/packages/forums/forums.info	22 Nov 2002 18:38:25 -0000	1.13.2.2
+++ openacs-4/packages/forums/forums.info	26 Nov 2002 02:38:08 -0000	1.13.2.3
@@ -35,6 +35,7 @@
             <file type="data_model" db_type="oracle" path="sql/oracle/forums-search-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/forums-search-drop.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/forums-tree-create.sql"/>
+            <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade-0.1d-0.2d.sql"/>
             <file type="data_model_create" db_type="postgresql" path="sql/postgresql/forums-create.sql"/>
             <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/forums-drop.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/forums-forums-create.sql"/>
@@ -49,11 +50,12 @@
             <file type="data_model" db_type="postgresql" path="sql/postgresql/forums-notifications-sanitize.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/forums-tree-create.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/forums-tree-drop.sql"/>
+            <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade-0.1d-0.2d.sql"/>
             <file type="tcl_procs" path="tcl/forum-message-reply-procs.tcl"/>
-            <file type="tcl_procs" path="tcl/forum-reply-procs.tcl"/>
-            <file type="query_file" path="tcl/forum-reply-procs.xql"/>
             <file type="query_file" db_type="oracle" path="tcl/forum-reply-procs-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="tcl/forum-reply-procs-postgresql.xql"/>
+            <file type="tcl_procs" path="tcl/forum-reply-procs.tcl"/>
+            <file type="query_file" path="tcl/forum-reply-procs.xql"/>
             <file type="tcl_procs" path="tcl/forums-procs.tcl"/>
             <file type="query_file" path="tcl/forums-procs.xql"/>
             <file type="tcl_procs" path="tcl/forums-security-procs.tcl"/>
@@ -78,8 +80,6 @@
             <file type="query_file" db_type="postgresql" path="www/index-postgresql.xql"/>
             <file type="content_page" path="www/index.adp"/>
             <file type="content_page" path="www/index.tcl"/>
-            <file type="content_page" path="www/not-allowed.adp"/>
-            <file type="content_page" path="www/not-allowed.tcl"/>
             <file type="content_page" path="www/master.adp"/>
             <file type="content_page" path="www/master.tcl"/>
             <file type="content_page" path="www/message-attachment-chunk.adp"/>
@@ -109,6 +109,8 @@
             <file type="content_page" path="www/moderate/message-edit.adp"/>
             <file type="content_page" path="www/moderate/message-edit.tcl"/>
             <file type="content_page" path="www/moderate/message-reject.tcl"/>
+            <file type="content_page" path="www/not-allowed.adp"/>
+            <file type="content_page" path="www/not-allowed.tcl"/>
             <file type="query_file" db_type="oracle" path="www/search-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/search-postgresql.xql"/>
             <file type="content_page" path="www/search.adp"/>
@@ -118,9 +120,9 @@
             <file type="query_file" path="www/user-history.xql"/>
         </files>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="table_bgcolor"  default="#eeeeee" description="This is the color of the first message / table row"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="table_other_bgcolor"  default="#d9e4f9" description="The bgcolor for the other table rows"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="table_border_color"  default="#dddddd" description="The color of the table borders and between the cells, try #ffffff for a cool look"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="table_other_bgcolor"  default="#d9e4f9" description="The bgcolor for the other table rows"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="table_bgcolor"  default="#eeeeee" description="This is the color of the first message / table row"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/forums/sql/oracle/forums-messages-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-messages-package-create.sql,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/forums/sql/oracle/forums-messages-package-create.sql	22 Nov 2002 18:38:27 -0000	1.3.2.1
+++ openacs-4/packages/forums/sql/oracle/forums-messages-package-create.sql	26 Nov 2002 02:38:11 -0000	1.3.2.2
@@ -80,9 +80,11 @@
     ) return forums_messages.message_id%TYPE
     is
         v_message_id acs_objects.object_id%TYPE;
+        v_sortkey forums_messages.tree_sortkey%TYPE;
         v_forum_policy forums_forums.posting_policy%TYPE;
         v_state forums_messages.state%TYPE;
     begin
+
         v_message_id := acs_object.new(
             object_id => message_id,
             object_type => object_type,
@@ -113,14 +115,20 @@
         values
         (v_message_id, forum_id, subject, content, html_p, user_id, posting_date, parent_id, v_state);
 
+        -- DRB: Can't use root_message_id() here because it triggers a "mutating table" error
 
+        select tree_sortkey into v_sortkey
+        from forums_messages
+        where message_id = v_message_id;
+
         update forums_forums
         set last_post = posting_date
         where forum_id = forums_message.new.forum_id;
 
         update forums_messages
         set last_child_post = posting_date
-        where message_id = forums_message.root_message_id(v_message_id);
+        where forum_id = forums_message.new.forum_id
+          and tree_sortkey = tree.ancestor_key(v_sortkey, 1);
 
         return v_message_id;
     end new;
Index: openacs-4/packages/forums/sql/oracle/upgrade-0.1d-0.2d.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/Attic/upgrade-0.1d-0.2d.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/forums/sql/oracle/upgrade-0.1d-0.2d.sql	22 Nov 2002 18:38:27 -0000	1.1.2.1
+++ openacs-4/packages/forums/sql/oracle/upgrade-0.1d-0.2d.sql	26 Nov 2002 02:38:11 -0000	1.1.2.2
@@ -64,7 +64,6 @@
     from forums_forums
     where enabled_p = 't';
 
-
 create or replace package body forums_message
 as
 
@@ -86,9 +85,11 @@
     ) return forums_messages.message_id%TYPE
     is
         v_message_id acs_objects.object_id%TYPE;
+        v_sortkey forums_messages.tree_sortkey%TYPE;
         v_forum_policy forums_forums.posting_policy%TYPE;
         v_state forums_messages.state%TYPE;
     begin
+
         v_message_id := acs_object.new(
             object_id => message_id,
             object_type => object_type,
@@ -119,14 +120,20 @@
         values
         (v_message_id, forum_id, subject, content, html_p, user_id, posting_date, parent_id, v_state);
 
+        -- DRB: Can't use root_message_id() here because it triggers a "mutating table" error
 
+        select tree_sortkey into v_sortkey
+        from forums_messages
+        where message_id = v_message_id;
+
         update forums_forums
         set last_post = posting_date
         where forum_id = forums_message.new.forum_id;
 
         update forums_messages
         set last_child_post = posting_date
-        where message_id = forums_message.root_message_id(v_message_id);
+        where forum_id = forums_message.new.forum_id
+          and tree_sortkey = tree.ancestor_key(v_sortkey, 1);
 
         return v_message_id;
     end new;
Index: openacs-4/packages/forums/www/message-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-chunk.adp,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/forums/www/message-chunk.adp	22 Nov 2002 18:34:25 -0000	1.11.2.1
+++ openacs-4/packages/forums/www/message-chunk.adp	26 Nov 2002 02:38:13 -0000	1.11.2.2
@@ -1,15 +1,16 @@
 
 <tr style="color: black; background-color: @table_bgcolor@;">
-  <td align=left style="padding-left: 1em">
 <if @display_subject_p@>
-  <strong>
-    <if @preview@ nil>
-      <a href="message-view?message_id=@message.message_id@">@message.subject@</a>
-    </if>
-    <else>
-      @message.subject@
-    </else>
-  </strong>  
+  <td align=left style="padding-left: 1em">
+    <strong>
+      <if @preview@ nil>
+        <a href="message-view?message_id=@message.message_id@">@message.subject@</a>
+      </if>
+      <else>
+        @message.subject@
+      </else>
+    </strong>  
+  </td>
 </if>
   <td align=center>
     <a href="user-history?user_id=@message.user_id@">@message.user_name@</a></td>