Index: openacs-4/packages/acs-subsite/lib/user-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-subsite/lib/user-info.tcl	5 Jan 2010 11:09:26 -0000	1.21
+++ openacs-4/packages/acs-subsite/lib/user-info.tcl	27 Oct 2014 16:39:45 -0000	1.22
@@ -1,24 +1,24 @@
 #
 # Expects: 
-#  user_id:optional
+#  user_id:naturalnum,optional
 #  return_url:optional
 #  edit_p:optional
 #  message:optional
 #  show_groups_p:optional
 
 auth::require_login -account_status closed
 
-if { ![exists_and_not_null user_id] } {
+if { (![info exists user_id] || $user_id eq "") } {
     set user_id [ad_conn untrusted_user_id]
 } elseif { $user_id != [auth::get_user_id -account_status closed] } {
     permission::require_permission -object_id $user_id -privilege admin
 }
 
-if { ![exists_and_not_null return_url] } {
+if { (![info exists return_url] || $return_url eq "") } {
     set return_url [ad_conn url]
 }
 
-if { ![exists_and_not_null show_groups_p] } {
+if { (![info exists show_groups_p] || $show_groups_p eq "") } {
     set show_groups_p 0
 }
 
@@ -41,10 +41,10 @@
     set elm_mode($elm) {display}
 }
 
-set edit_mode_p [expr ![empty_string_p [form::get_action user_info]]]
+set edit_mode_p [expr {[form::get_action user_info] ne ""}]
 
 set form_mode display
-if { [exists_and_equal edit_p 1] } {
+if { [info exists edit_p] && $edit_p eq "1" } {
     set form_mode edit
 }