Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	27 Nov 2007 13:23:20 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	27 Nov 2007 14:51:53 -0000	1.10
@@ -41,9 +41,9 @@
 }
 
 if {$admin_p} {
-    set context [list [list "./?user_id=$user_id" [_ acs-subsite.User_Portrait]] [_ acs-subsite.Upload_Portrait]]
+    set context [list [list "./?[export_vars user_id]" [_ acs-subsite.User_Portrait]] [_ acs-subsite.Upload_Portrait]]
 } else {
-    set context [list [list "./?return_url=$return_url" [_ acs-subsite.Your_Portrait]] [_ acs-subsite.Upload_Portrait]]
+    set context [list [list "./?[export_vars return_url]" [_ acs-subsite.Your_Portrait]] [_ acs-subsite.Upload_Portrait]]
 }
 
 set export_vars [export_form_vars user_id return_url]