Index: openacs-4/packages/acs-subsite/www/admin/groups/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	27 Apr 2015 15:28:18 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	9 Jun 2015 07:57:52 -0000	1.9
@@ -115,7 +115,6 @@
 template::form create add_group
 
 attribute::add_form_elements -form_id add_group -variable_prefix group -start_with group -object_type $group_type
-
 attribute::add_form_elements -form_id add_group -variable_prefix rel -start_with relationship -object_type $add_with_rel_type
 
 if { [template::form is_request add_group] } {
@@ -135,11 +134,8 @@
 
 if { [template::form is_valid add_group] } {
     db_transaction {
-
-	group::new -form_id add_group -variable_prefix group -group_id $group_id -context_id [ad_conn package_id]  $group_type 
-
+	group::new -form_id add_group -variable_prefix group -group_id $group_id -context_id [ad_conn package_id] $group_type 
 	relation_add -member_state $member_state $add_with_rel_type $add_to_group_id $group_id
-
     }
 
     # there may be more segments to put this new group in before the
@@ -149,7 +145,12 @@
     foreach group_rel_type $group_rel_type_list {
 	lassign $group_rel_type next_group_id next_rel_type
 	lappend return_url_list \
-		"${package_url}admin/relations/add?group_id=$next_group_id&rel_type=[ad_urlencode $next_rel_type]&party_id=$group_id&allow_out_of_scope_p=t"
+	    [export_vars -base "${package_url}admin/relations/add" {
+		{group_id $next_group_id}
+		{rel_type [ad_urlencode $next_rel_type]}
+		{party_id $group_id}
+		{allow_out_of_scope_p t}
+	    }]
     }
 
     # Add the original return_url as the last one in the list