Index: openacs-4/packages/acs-admin/www/users/member-state-change-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/member-state-change-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/member-state-change-oracle.xql	29 Apr 2001 00:47:48 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/member-state-change-oracle.xql	15 Feb 2002 01:41:31 -0000	1.4
@@ -5,7 +5,7 @@
 
 <fullquery name="get_states">      
       <querytext>
-      select email_verified_p email_verified_p_old, member_state member_state_old, first_names || ' ' || last_name as name, email, rel_id, rowid
+      select email_verified_p email_verified_p_old, member_state member_state_old, first_names || ' ' || last_name as name, email, rel_id, rowid as row_id
 from cc_users
 where user_id = :user_id
       </querytext>
Index: openacs-4/packages/acs-admin/www/users/member-state-change-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/member-state-change-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/users/member-state-change-postgresql.xql	13 Feb 2002 17:41:11 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/member-state-change-postgresql.xql	15 Feb 2002 01:41:31 -0000	1.6
@@ -5,12 +5,16 @@
 
 <fullquery name="get_states">      
       <querytext>
-      select email_verified_p as email_verified_p_old,
-          member_state as member_state_old,
-          first_names || ' ' || last_name as name,
-          email, rel_id, oid as rowid
-      from cc_users
-      where user_id = :user_id
+      select u.email_verified_p as email_verified_p_old,
+          mr.member_state as member_state_old,
+          per.first_names || ' ' || per.last_name as name,
+          part.email, mr.rel_id, u.oid as row_id
+      from users u
+      JOIN parties part on (part.party_id = u.user_id)
+        JOIN persons per on (per.person_id = u.user_id)
+      LEFT JOIN membership_rels mr on (mr.rel_id = u.user_id)
+      where u.user_id = :user_id
+      
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	13 Feb 2002 17:41:11 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	15 Feb 2002 01:41:31 -0000	1.4
@@ -23,7 +23,7 @@
            first_names || ' ' || last_name as name,
            email,
            rel_id,
-           rowid
+           row_id
     from cc_users
     where user_id = :user_id
 }]} {
@@ -64,7 +64,7 @@
     }
     "f" {
 	set action "Require Email from $name"
-	set email_message "Your email in [ad_system_name] needs approval. please go to [ad_parameter SystemURL]/register/email-confirm.tcl?[export_url_vars rowid]"
+	set email_message "Your email in [ad_system_name] needs approval. please go to [ad_parameter -package_id [ad_acs_kernel_id] SystemURL]/register/email-confirm.tcl?[export_url_vars row_id]"
     }
 }