Index: openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.0.6-1.0.7d.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.0.6-1.0.7d.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.0.6-1.0.7d.sql	23 Dec 2004 02:12:54 -0000	1.1.2.1
+++ openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.0.6-1.0.7d.sql	23 Dec 2004 17:58:40 -0000	1.1.2.2
@@ -49,12 +49,14 @@
                             from forums_messages_approved fm1
                             where fm1.tree_sortkey
                               between tree_left(forums_messages.tree_sortkey)
-                              and tree_right(forums_messages.tree_sortkey)),
+                              and tree_right(forums_messages.tree_sortkey)
+                              and forums_messages.forum_id = fm1.forum_id),
      reply_count = (select count(*)
                     from forums_messages fm1
                     where fm1.tree_sortkey
                       between tree_left(forums_messages.tree_sortkey)
-                      and tree_right(forums_messages.tree_sortkey))
+                      and tree_right(forums_messages.tree_sortkey)
+                      and forums_messages.forum_id = fm1.forum_id)
 where parent_id is null;
 
 select define_function_args ('forums_message__new', 'message_id,object_type;forums_message,forum_id,subject,content,format,user_id,state,parent_id,creation_date,creation_user,creation_ip,context_id');