Index: openacs-4/packages/acs-kernel/acs-kernel.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v
diff -u -r1.49.2.2 -r1.49.2.3
--- openacs-4/packages/acs-kernel/acs-kernel.info	20 Nov 2003 21:24:02 -0000	1.49.2.2
+++ openacs-4/packages/acs-kernel/acs-kernel.info	30 Nov 2003 01:17:56 -0000	1.49.2.3
@@ -7,13 +7,13 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.0.0b3" url="http://openacs.org/repository/download/apm/acs-kernel-5.0.0b3.apm">
+    <version name="5.0.0b4" url="http://openacs.org/repository/download/apm/acs-kernel-5.0.0b4.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>Routines and data models providing the foundation for OpenACS-based Web services.</summary>
         <release-date>2003-11-07</release-date>
         <vendor url="http://openacs.org/">OpenACS</vendor>
 
-        <provides url="acs-kernel" version="5.0.0b3"/>
+        <provides url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql,v
diff -u -r1.10.2.2 -r1.10.2.3
--- openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql	21 Nov 2003 01:39:14 -0000	1.10.2.2
+++ openacs-4/packages/acs-kernel/sql/oracle/acs-create.sql	30 Nov 2003 01:17:56 -0000	1.10.2.3
@@ -170,6 +170,7 @@
   and m.rel_id = mr.rel_id
   and m.group_id = (select acs.magic_object_id('registered_users') from dual)
   and m.container_id = m.group_id
+  and m.rel_type = 'membership_rel'
   and mr.member_state = 'approved'
   and u.email_verified_p = 't';
 
@@ -200,7 +201,8 @@
 and m.group_id = mo.object_id
 and mo.name = 'registered_users'
 and m.rel_id = mr.rel_id
-and m.container_id = m.group_id;
+and m.container_id = m.group_id
+and m.rel_type = 'membership_rel';
 
 
 -----------------------------------
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0.0b3-5.0.0b4.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql,v
diff -u -r1.22.2.3 -r1.22.2.4
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql	24 Nov 2003 17:25:15 -0000	1.22.2.3
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql	30 Nov 2003 01:17:56 -0000	1.22.2.4
@@ -155,6 +155,7 @@
   and amo.name = 'registered_users'
   and m.group_id = amo.object_id
   and m.container_id = m.group_id
+  and m.rel_type = 'membership_rel'
   and mr.member_state = 'approved'
   and u.email_verified_p = 't';
 
@@ -179,7 +180,8 @@
   and amo.name = 'registered_users'
   and m.group_id = amo.object_id
   and m.rel_id = mr.rel_id
-  and m.container_id = m.group_id;
+  and m.container_id = m.group_id
+  and m.rel_type = 'membership_rel';
 
 
 -----------------------------------
Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql	24 Nov 2003 17:25:15 -0000	1.1.2.1
+++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0.0b3-5.0.0b4.sql	30 Nov 2003 01:17:56 -0000	1.1.2.2
@@ -768,3 +768,35 @@
   where segment_id = name__segment_id;
 
 end;' language 'plpgsql' stable strict;
+
+---- DRB: fixes bug 1144
+
+create or replace view registered_users
+as
+  select p.email, p.url, pe.first_names, pe.last_name, u.*, mr.member_state
+  from parties p, persons pe, users u, group_member_map m, membership_rels mr, acs_magic_objects amo
+  where party_id = person_id
+  and person_id = user_id
+  and u.user_id = m.member_id
+  and m.rel_id = mr.rel_id
+  and amo.name = 'registered_users'
+  and m.group_id = amo.object_id
+  and m.container_id = m.group_id
+  and m.rel_type = 'membership_rel'
+  and mr.member_state = 'approved'
+  and u.email_verified_p = 't';
+
+create or replace view cc_users
+as
+select o.*, pa.*, pe.*, u.*, mr.member_state, mr.rel_id
+from acs_objects o, parties pa, persons pe, users u, group_member_map m, membership_rels mr, acs_magic_objects amo
+where o.object_id = pa.party_id
+  and pa.party_id = pe.person_id
+  and pe.person_id = u.user_id
+  and u.user_id = m.member_id
+  and amo.name = 'registered_users'
+  and m.group_id = amo.object_id
+  and m.rel_id = mr.rel_id
+  and m.container_id = m.group_id
+  and m.rel_type = 'membership_rel';
+