Index: openacs-4/packages/acs-subsite/www/register/user-join.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-join.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/register/user-join.tcl	10 Oct 2003 13:32:01 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/register/user-join.tcl	10 Oct 2003 16:35:03 -0000	1.7
@@ -132,10 +132,18 @@
             }
         }
     
-        if {[string equal $join_policy "needs approval"]} {
-            set member_state "needs approval"
-        } else {
+        if { [permission::permission_p -object_id $group_id -privilege "admin"] } {
             set member_state "approved"
+            if { [string equal $rel_type "membership_rel"] } {
+                # If they already have admin, bump them to an admin_rel
+                set rel_type "admin_rel"
+            }
+        } else {
+            if { [string equal $join_policy "needs approval"]  } {
+                set member_state "needs approval"
+            } else {
+                set member_state "approved"
+            }
         }
 
         set rel_id [relation_add -form_id join -member_state $member_state $rel_type $group_id $party_id]