Index: openacs-4/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/forums.info	3 Jun 2002 04:39:05 -0000	1.4
+++ openacs-4/packages/forums/forums.info	3 Jun 2002 16:39:56 -0000	1.5
@@ -93,9 +93,9 @@
             <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="query_file" db_type="oracle" path="www/user-history-oracle.xql"/>
             <file type="content_page" path="www/user-history.adp"/>
             <file type="content_page" path="www/user-history.tcl"/>
+            <file type="query_file" path="www/user-history.xql"/>
         </files>
         <parameters>
         <!-- No version parameters -->
Index: openacs-4/packages/forums/www/forum-view-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/forum-view-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/forum-view-oracle.xql	3 Jun 2002 04:39:05 -0000	1.2
+++ openacs-4/packages/forums/www/forum-view-oracle.xql	3 Jun 2002 16:39:56 -0000	1.3
@@ -12,7 +12,8 @@
                    fm.state,
                    (select count(*)
                     from forums_messages_approved fm1
-                    where fm1.tree_sortkey between tree.left(fm.tree_sortkey) and tree.right(fm.tree_sortkey)) as n_messages,
+                    where fm1.forum_id = :forum_id
+                    and fm1.tree_sortkey between tree.left(fm.tree_sortkey) and tree.right(fm.tree_sortkey)) as n_messages,
                    to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified
             from forums_messages_approved fm,
                  acs_objects
@@ -33,7 +34,8 @@
                    fm.state,
                    (select count(*)
                     from forums_messages fm1
-                    where fm1.tree_sortkey between tree.left(fm.tree_sortkey) and tree.right(fm.tree_sortkey)) as n_messages,
+                    where fm1.forum_id = :forum_id
+                    and fm1.tree_sortkey between tree.left(fm.tree_sortkey) and tree.right(fm.tree_sortkey)) as n_messages,
                    to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified
             from forums_messages fm,
                  acs_objects
Index: openacs-4/packages/forums/www/forum-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/forum-view-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/forum-view-postgresql.xql	3 Jun 2002 04:39:05 -0000	1.1
+++ openacs-4/packages/forums/www/forum-view-postgresql.xql	3 Jun 2002 16:39:56 -0000	1.2
@@ -12,7 +12,8 @@
                    fm.state,
                    (select count(fm1.*)
                     from forums_messages_approved fm1
-                    where fm1.tree_sortkey between tree__left(fm.tree_sortkey) and tree__right(fm.tree_sortkey)) as n_messages,
+                    where fm1.forum_id = :forum_id
+                    and fm1.tree_sortkey between tree__left(fm.tree_sortkey) and tree__right(fm.tree_sortkey)) as n_messages,
                    to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified
             from forums_messages_approved fm,
                  acs_objects
@@ -33,7 +34,8 @@
                    fm.state,
                    (select count(fm1.*)
                     from forums_messages fm1
-                    where fm1.tree_sortkey between tree__left(fm.tree_sortkey) and tree__right(fm.tree_sortkey)) as n_messages,
+                    where fm1.forum_id = :forum_id
+                    and fm1.tree_sortkey between tree__left(fm.tree_sortkey) and tree__right(fm.tree_sortkey)) as n_messages,
                    to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified
             from forums_messages fm,
                  acs_objects