Index: openacs-4/packages/acs-admin/www/users/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-admin/www/users/one.tcl	10 Jan 2007 21:22:00 -0000	1.15
+++ openacs-4/packages/acs-admin/www/users/one.tcl	23 Dec 2008 08:31:46 -0000	1.16
@@ -22,6 +22,9 @@
 
 set return_url [ad_return_url]
 
+set delete_user_url [export_vars -base delete-user { user_id return_url {permanent f}}]
+set delete_user_permanent_url [export_vars -base delete-user { user_id return_url {permanent t}}]
+
 #
 # RBM: Check if the requested user is a site-wide admin and warn the 
 # viewer in that case (so that a ban/deletion can be avoided).
@@ -86,11 +89,11 @@
   order by lower(groups.group_name)"
 
 if { [auth::password::can_reset_p -authority_id $user_info(authority_id)] } {
-    set password_reset_url [export_vars -base "password-reset" { user_id { return_url [ad_return_url] } }]
-    set password_update_url [export_vars -base "password-update" { user_id { return_url [ad_return_url] } }]
+    set password_reset_url [export_vars -base "password-reset" { user_id return_url }]
+    set password_update_url [export_vars -base "password-update" { user_id return_url }]
 }
 
-set portrait_manage_url [export_vars -base /user/portrait/ { user_id { return_url [ad_return_url] } }]
+set portrait_manage_url [export_vars -base /user/portrait/ { user_id return_url }]
 
 
 ad_return_template