Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/admin/users/new.tcl	27 Jun 2015 16:03:13 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl	7 Aug 2017 23:47:59 -0000	1.17
@@ -12,7 +12,7 @@
     { user_type:notnull "user" }
     { user_type_exact_p:boolean t }
     { user_id:naturalnum "" }
-    { return_url "" }
+    { return_url:localurl "" }
     {add_to_group_id:naturalnum ""}
     {add_with_rel_type "user_profile"}
     {group_rel_type_list ""}
@@ -36,16 +36,7 @@
 }
 
 # We assume the group is on side 1... 
-db_1row rel_type_info {
-    select object_type as ancestor_rel_type
-      from acs_object_types
-     where supertype = 'relationship'
-       and object_type in (
-               select object_type from acs_object_types
-               start with object_type = :add_with_rel_type
-               connect by object_type = prior supertype
-           )
-}
+db_1row rel_type_info {}
 
 set create_p [group::permission_p -privilege create $add_to_group_id]
 
@@ -160,12 +151,7 @@
 	set email_verified_p "t"
     }
 
-    set double_click_p [db_string user_exists {
-	select case when exists
-	                 (select 1 from users where user_id = :user_id)
-	       then 1 else 0 end
-	from dual
-    }]
+    set double_click_p [db_string user_exists {}]
 
     if {!$double_click_p} {
 
@@ -245,7 +231,7 @@
 
 	if { $email_verified_p == "f" } {
 	
-	    set row_id [db_string user_new_2_rowid_for_email "select rowid from users where user_id = :user_id"]
+	    set row_id [db_string user_new_2_rowid_for_email {select rowid from users where user_id = :user_id}]
 	    # the user has to come back and activate their account
 
             set href [export_vars \
@@ -290,3 +276,9 @@
 
 ad_return_template
 
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: