Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.74.2.5 -r1.74.2.6
--- openacs-4/packages/acs-subsite/acs-subsite.info	15 Sep 2005 08:04:33 -0000	1.74.2.5
+++ openacs-4/packages/acs-subsite/acs-subsite.info	16 Sep 2005 14:20:24 -0000	1.74.2.6
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.2.0a4" url="http://openacs.org/repository/download/apm/acs-subsite-5.2.0a4.apm">
+    <version name="5.2.0a5" url="http://openacs.org/repository/download/apm/acs-subsite-5.2.0a5.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
         <release-date>2004-04-29</release-date>
@@ -16,7 +16,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.2.0a4"/>
+        <provides url="acs-subsite" version="5.2.0a5"/>
         <requires url="acs-authentication" version="5.2.0a1"/>
         <requires url="acs-content-repository" version="5.2.0a1"/>
         <requires url="acs-kernel" version="5.2.0a1"/>
Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v
diff -u -r1.25.2.7 -r1.25.2.8
--- openacs-4/packages/acs-subsite/tcl/group-procs.tcl	15 Sep 2005 08:04:33 -0000	1.25.2.7
+++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl	16 Sep 2005 14:20:24 -0000	1.25.2.8
@@ -290,8 +290,7 @@
 } {
     switch $type {
 	party  { set member_list [db_list group_members_party {}] }
-	person { set member_list [db_list group_members_person {}] }
-	user   { set member_list [db_list group_members_user {}] }
+	default { set member_list [db_list group_members {}] }
     }
 
     return $member_list
Index: openacs-4/packages/acs-subsite/tcl/group-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/Attic/group-procs.xql,v
diff -u -r1.6.2.3 -r1.6.2.4
--- openacs-4/packages/acs-subsite/tcl/group-procs.xql	15 Sep 2005 08:04:33 -0000	1.6.2.3
+++ openacs-4/packages/acs-subsite/tcl/group-procs.xql	16 Sep 2005 14:20:24 -0000	1.6.2.4
@@ -41,27 +41,18 @@
       </querytext>
 </fullquery>
 
-<fullquery name="group::get_members_not_cached.group_members_person">
+<fullquery name="group::get_members_not_cached.group_members">
       <querytext>
       
 		select m.member_id
-		from group_member_map m, persons p
+		from group_member_map m, acs_objects o
 		where m.group_id = :group_id
-		and m.member_id = p.person_id
+		and m.member_id = o.object_id
+		and o.object_type = :type
 	
       </querytext>
 </fullquery>
 
-<fullquery name="group::get_members_not_cached.group_members_user">
-      <querytext>
-      
-		select m.member_id
-		from group_member_map m, users u
-		where m.group_id = :group_id
-		and m.member_id = u.user_id
-	
-      </querytext>
-</fullquery>
 
 <fullquery name="group::join_policy.select_join_policy">      
       <querytext>